From d0ccb5743d00738ed4eb76394f0ea9e0f5379bc7 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Tue, 6 Jul 2010 13:50:03 +0200
Subject: [PATCH] refining tests for jython and python2.7

---
 testing/acceptance_test.py | 1 +
 testing/test_deprecated.py | 2 +-
 tox.ini                    | 5 ++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
index 8e4cd58..f086709 100644
--- a/testing/acceptance_test.py
+++ b/testing/acceptance_test.py
@@ -47,6 +47,7 @@ class TestDistribution:
         ])
         assert result.ret == 1
 
+    @py.test.mark.xfail("sys.platform.startswith('java')")
     def test_dist_tests_with_crash(self, testdir):
         if not hasattr(py.std.os, 'kill'):
             py.test.skip("no os.kill")
diff --git a/testing/test_deprecated.py b/testing/test_deprecated.py
index bb9cc58..5959964 100644
--- a/testing/test_deprecated.py
+++ b/testing/test_deprecated.py
@@ -1,6 +1,6 @@
 import py
 
-def test_dist_conftest_options(testdir):
+def test_dist_conftest_options(testdir, recwarn):
     p1 = testdir.tmpdir.ensure("dir", 'p1.py')
     p1.dirpath("__init__.py").write("")
     p1.dirpath("conftest.py").write(py.code.Source("""
diff --git a/tox.ini b/tox.ini
index 4f63110..6f87edc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,6 +26,5 @@ basepython=python2.4
 basepython=python3.1
 #[testenv:pypy]
 #basepython=pypy-c
-#[testenv:jython]
-#basepython=jython
-
+[testenv:jython]
+basepython=jython