Author: rhuijben
Date: Thu Jul 8 21:03:01 2010
New Revision: 961935
URL: http://svn.apache.org/viewvc?rev=961935&view=rev
Log:
Following up on r954830, which introduced the options class in our test
framework fix a few references to the removed .verbose_mode variable.
* subversion/tests/cmdline/checkout_tests.py
(test_stderr): Fix reference.
* subversion/tests/cmdline/svntest/sandbox.py
(_cleanup_test_path): Fix reference.
* subversion/tests/cmdline/tree_conflict_tests.py
(verbose_printlines): Fix reference.
Modified:
subversion/trunk/subversion/tests/cmdline/checkout_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py
subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/checkout_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/checkout_tests.py?rev=961935&r1=961934&r2=961935&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/checkout_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/checkout_tests.py Thu Jul 8
21:03:01 2010
@@ -46,7 +46,7 @@ def test_stderr(re_string, stderr):
for line in stderr:
if exp_err_re.search(line):
return
- if svntest.main.verbose_mode:
+ if svntest.main.options.verbose:
for x in stderr:
sys.stdout.write(x)
print("Expected stderr reg-ex: '" + re_string + "'")
Modified: subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py?rev=961935&r1=961934&r2=961935&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py Thu Jul 8
21:03:01 2010
@@ -220,6 +220,6 @@ def _cleanup_test_path(path, retrying=Fa
try:
svntest.main.safe_rmtree(path)
except:
- if svntest.main.verbose_mode:
+ if svntest.main.options.verbose:
print("WARNING: cleanup failed, will try again later")
_deferred_test_paths.append(path)
Modified: subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py?rev=961935&r1=961934&r2=961935&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Thu Jul 8
21:03:01 2010
@@ -51,7 +51,7 @@ def verbose_print(line):
# If verbose mode is enabled, print the (assumed newline-terminated) LINES.
def verbose_printlines(lines):
- if main.verbose_mode:
+ if main.options.verbose:
for line in lines:
sys.stdout.write(line)
