[Pytest-commit] commit/pytest: 4 new changesets

[commits-noreply at bitbucket.org]

4 new commits in pytest:

https://bitbucket.org/hpk42/pytest/commits/89e5be038d30/
Changeset:   89e5be038d30
User:        hpk42
Date:        2013-05-09 15:50:09
Summary:     honor --tb style for setup/teardown errors as well.
Affected #:  1 file

diff -r fb4c4834bcf6c95238b608ea2304a53caea3eb9d -r 89e5be038d30539715ff55e85ad013027ba2cfe1 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,7 @@
   which fixes py.io.dupfile to work with files with no
   mode. Thanks Jason R. Coombs.
 
+- honor --tb style for setup/teardown errors as well.
 
 Changes between 2.3.4 and 2.3.5
 -----------------------------------


https://bitbucket.org/hpk42/pytest/commits/13e9038463fc/
Changeset:   13e9038463fc
User:        hpk42
Date:        2013-05-09 15:50:28
Summary:     mention --tb style change in changelog
Affected #:  1 file

diff -r 89e5be038d30539715ff55e85ad013027ba2cfe1 -r 13e9038463fce9202efd89967a5288c107e81944 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,7 +15,7 @@
   which fixes py.io.dupfile to work with files with no
   mode. Thanks Jason R. Coombs.
 
-- honor --tb style for setup/teardown errors as well.
+- honor --tb style for setup/teardown errors as well.  Thanks Maho.
 
 Changes between 2.3.4 and 2.3.5
 -----------------------------------


https://bitbucket.org/hpk42/pytest/commits/ca3f3ad80a2b/
Changeset:   ca3f3ad80a2b
User:        hpk42
Date:        2013-05-10 08:13:35
Summary:     fix junitxml generation when test output contains control characters,
addressing issue267
Affected #:  3 files

diff -r 13e9038463fce9202efd89967a5288c107e81944 -r ca3f3ad80a2be9eae5a878b5e588a4bcc1d5b1fe CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,9 @@
   which fixes py.io.dupfile to work with files with no
   mode. Thanks Jason R. Coombs.
 
+- fix junitxml generation when test output contains control characters,
+  addressing issue267 
+
 - honor --tb style for setup/teardown errors as well.  Thanks Maho.
 
 Changes between 2.3.4 and 2.3.5

diff -r 13e9038463fce9202efd89967a5288c107e81944 -r ca3f3ad80a2be9eae5a878b5e588a4bcc1d5b1fe _pytest/junitxml.py
--- a/_pytest/junitxml.py
+++ b/_pytest/junitxml.py
@@ -36,7 +36,8 @@
 #                    | [#x10000-#x10FFFF]
 _legal_chars = (0x09, 0x0A, 0x0d)
 _legal_ranges = (
-    (0x20, 0xD7FF),
+    (0x20, 0x7E),
+    (0x80, 0xD7FF),
     (0xE000, 0xFFFD),
     (0x10000, 0x10FFFF),
 )
@@ -103,7 +104,7 @@
             classnames.insert(0, self.prefix)
         self.tests.append(Junit.testcase(
             classname=".".join(classnames),
-            name=names[-1],
+            name=bin_xml_escape(names[-1]),
             time=getattr(report, 'duration', 0)
         ))
 

diff -r 13e9038463fce9202efd89967a5288c107e81944 -r ca3f3ad80a2be9eae5a878b5e588a4bcc1d5b1fe testing/test_junitxml.py
--- a/testing/test_junitxml.py
+++ b/testing/test_junitxml.py
@@ -450,3 +450,16 @@
     assert result.ret == 0
     assert testdir.tmpdir.join("a/x.xml").check()
 
+def test_escaped_parametrized_names_xml(testdir):
+    testdir.makepyfile("""
+        import pytest
+        @pytest.mark.parametrize('char', ["\\x00"])
+        def test_func(char):
+            assert char
+    """)
+    result, dom = runandparse(testdir)
+    assert result.ret == 0
+    node = dom.getElementsByTagName("testcase")[0]
+    assert_attr(node,
+        name="test_func[#x00]")
+


https://bitbucket.org/hpk42/pytest/commits/7c468f83e347/
Changeset:   7c468f83e347
User:        hpk42
Date:        2013-05-10 08:14:39
Summary:     add Jaap Broekhuizen for junitxml gen
Affected #:  2 files

diff -r ca3f3ad80a2be9eae5a878b5e588a4bcc1d5b1fe -r 7c468f83e347c21fbed87eeae457f645bfcc7a66 AUTHORS
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,6 +11,7 @@
 Carl Friedrich Bolz
 Armin Rigo
 Maho
+Jaap Broekhuizen 
 Maciek Fijalkowski
 Guido Wesdorp
 Brian Dorsey

diff -r ca3f3ad80a2be9eae5a878b5e588a4bcc1d5b1fe -r 7c468f83e347c21fbed87eeae457f645bfcc7a66 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,7 +16,7 @@
   mode. Thanks Jason R. Coombs.
 
 - fix junitxml generation when test output contains control characters,
-  addressing issue267 
+  addressing issue267, thanks Jaap Broekhuizen 
 
 - honor --tb style for setup/teardown errors as well.  Thanks Maho.

Repository URL: https://bitbucket.org/hpk42/pytest/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.