[Jython-checkins] jython: Fix minor regression in test_java_integration.

jeff.allen jython-checkins at python.org
Mon Apr 20 00:50:16 CEST 2015


https://hg.python.org/jython/rev/2b52f81c8e90
changeset:   7684:2b52f81c8e90
user:        Jeff Allen <ja.py at farowl.co.uk>
date:        Sat Apr 18 23:16:43 2015 +0100
summary:
  Fix minor regression in test_java_integration.

Stop expecting a sys-package-mgr message, suppressed under issue 1572.

files:
  Lib/test/test_java_integration.py |  11 ++++-------
  1 files changed, 4 insertions(+), 7 deletions(-)


diff --git a/Lib/test/test_java_integration.py b/Lib/test/test_java_integration.py
--- a/Lib/test/test_java_integration.py
+++ b/Lib/test/test_java_integration.py
@@ -748,7 +748,7 @@
             classpath = os.pathsep.join(jars)
             compile_java_source(
                 ["-classpath", classpath, "-d", tempdir],
-                "BarkTheDog", source)           
+                "BarkTheDog", source)
 
             # Then in a completely different JVM running our
             # BarkTheDog code, verify we get an appropriate bark
@@ -763,11 +763,8 @@
             self.assertRegexpMatches(
                 subprocess.check_output(cmd, env=env, universal_newlines=True,
                                         stderr=subprocess.STDOUT),
-                os.path.join(
-                    r"^\*sys-package-mgr\*: processing new jar, '.+?",
-                    r"proxies.jar'\n"
-                    "Class defined on CLASSPATH <type 'org.python.test.bark.Dog'>\n"
-                    "Rover barks 42 times\n$".format(tempdir)))
+                r"^Class defined on CLASSPATH <type 'org.python.test.bark.Dog'>\n"
+                                        "Rover barks 42 times$")
         finally:
             pass
             # print "Will not remove", tempdir
@@ -775,7 +772,7 @@
 
 
 class CopyTest(unittest.TestCase):
-    
+
     def test_copy(self):
         fruits = ArrayList(["apple", "banana"])
         fruits_copy = copy.copy(fruits)

-- 
Repository URL: https://hg.python.org/jython


More information about the Jython-checkins mailing list