Skip to content

Commit bceabe9

Browse files
committed
Fix minor regression in test_java_integration.
Stop expecting a sys-package-mgr message, suppressed under issue 1572.
1 parent 4f336d6 commit bceabe9

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

Lib/test/test_java_integration.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ def test_custom_proxymaker(self):
748748
classpath = os.pathsep.join(jars)
749749
compile_java_source(
750750
["-classpath", classpath, "-d", tempdir],
751-
"BarkTheDog", source)
751+
"BarkTheDog", source)
752752

753753
# Then in a completely different JVM running our
754754
# BarkTheDog code, verify we get an appropriate bark
@@ -763,19 +763,16 @@ def test_custom_proxymaker(self):
763763
self.assertRegexpMatches(
764764
subprocess.check_output(cmd, env=env, universal_newlines=True,
765765
stderr=subprocess.STDOUT),
766-
os.path.join(
767-
r"^\*sys-package-mgr\*: processing new jar, '.+?",
768-
r"proxies.jar'\n"
769-
"Class defined on CLASSPATH <type 'org.python.test.bark.Dog'>\n"
770-
"Rover barks 42 times\n$".format(tempdir)))
766+
r"^Class defined on CLASSPATH <type 'org.python.test.bark.Dog'>\n"
767+
"Rover barks 42 times$")
771768
finally:
772769
pass
773770
# print "Will not remove", tempdir
774771
#shutil.rmtree(tempdir)
775772

776773

777774
class CopyTest(unittest.TestCase):
778-
775+
779776
def test_copy(self):
780777
fruits = ArrayList(["apple", "banana"])
781778
fruits_copy = copy.copy(fruits)

0 commit comments

Comments
 (0)