Author: kotkov Date: Sun Dec 3 17:48:02 2017 New Revision: 1817044 URL: http://svn.apache.org/viewvc?rev=1817044&view=rev Log: Following up on r1816967, attempt to fix the Python 3 buildbot failure.
See https://ci.apache.org/builders/svn-x64-macosx-local-python3/builds/822 * subversion/tests/cmdline/svntest/verify.py (): Only import the `svntest` module. (compare_dump_files): Access the fs_has_sha1() check function as `svntest.main.fs_has_sha1()`. Modified: subversion/trunk/subversion/tests/cmdline/svntest/verify.py Modified: subversion/trunk/subversion/tests/cmdline/svntest/verify.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/verify.py?rev=1817044&r1=1817043&r2=1817044&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svntest/verify.py (original) +++ subversion/trunk/subversion/tests/cmdline/svntest/verify.py Sun Dec 3 17:48:02 2017 @@ -29,7 +29,7 @@ from difflib import unified_diff, ndiff import pprint import logging -import svntest, main +import svntest logger = logging.getLogger() @@ -739,7 +739,7 @@ def compare_dump_files(message, label, e of lines as returned by run_and_verify_dump, and check that the same revisions, nodes, properties, etc. are present in both dumps. """ - parsed_expected = DumpParser(expected, not main.fs_has_sha1()).parse() + parsed_expected = DumpParser(expected, not svntest.main.fs_has_sha1()).parse() parsed_actual = DumpParser(actual).parse() if ignore_uuid:
