From e2c11f1ddb1e64c9a154b59c0af5b3afe7833e01 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Tue, 28 Sep 2010 17:37:20 +0200
Subject: [PATCH] fix python3 issues, add py32 environment

--HG--
branch : trunk
---
 testing/code/test_source.py            | 2 +-
 testing/plugin/test_pytest_terminal.py | 1 -
 tox.ini                                | 4 ++++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/testing/code/test_source.py b/testing/code/test_source.py
index 4be583803..afcd28d7a 100644
--- a/testing/code/test_source.py
+++ b/testing/code/test_source.py
@@ -348,7 +348,7 @@ def test_deindent():
     lines = deindent(source.splitlines())
     assert lines == ['', 'def f():', '    def g():', '        pass', '    ']
 
-@py.test.mark.xfail("sys.version_info[:2] != (2,7)")
+@py.test.mark.xfail("sys.version_info[:2] != (2,7) and sys.version_info[:2]<(3,2)")
 def test_source_of_class_at_eof_without_newline(tmpdir):
     # this test fails because the implicit inspect.getsource(A) below
     # does not return the "x = 1" last line.
diff --git a/testing/plugin/test_pytest_terminal.py b/testing/plugin/test_pytest_terminal.py
index c84ba4cb1..c54e5729d 100644
--- a/testing/plugin/test_pytest_terminal.py
+++ b/testing/plugin/test_pytest_terminal.py
@@ -112,7 +112,6 @@ class TestTerminal:
         child.sendeof()
         child.kill(15)
 
-    @py.test.mark.xfail(reason="re-implement subclassing precision reporting")
     def test_itemreport_subclasses_show_subclassed_file(self, testdir):
         p1 = testdir.makepyfile(test_p1="""
             class BaseTests:
diff --git a/tox.ini b/tox.ini
index 158e1c32f..770e998d9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -47,6 +47,10 @@ basepython=python2.4
 [testenv:py31]
 basepython=python3.1
 deps=
+[testenv:py32]
+basepython=python3.2
+deps=
+#{distshare}/pytest-xdist-*
 #[testenv:pypy]
 #python=pypy-c
 [testenv:jython]