diff options
Diffstat (limited to 'subversion/tests/cmdline/svntest/factory.py')
-rw-r--r-- | subversion/tests/cmdline/svntest/factory.py | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/subversion/tests/cmdline/svntest/factory.py b/subversion/tests/cmdline/svntest/factory.py index 9a2b17b..32093ea 100644 --- a/subversion/tests/cmdline/svntest/factory.py +++ b/subversion/tests/cmdline/svntest/factory.py @@ -97,7 +97,7 @@ # # YOU ARE CORDIALLY INVITED to add/tweak/change to your needs. # If you want to know what's going on, look at the switch() -# funtion of TestFactory below. +# function of TestFactory below. # # # DETAILS @@ -308,7 +308,7 @@ class TestFactory: # An optimized list kept up-to-date by variable additions self.sorted_vars_by_pathlen = [] - # Wether we ever used the variables 'wc_dir' and 'url' (tiny tweak) + # Whether we ever used the variables 'wc_dir' and 'url' (tiny tweak) self.used_wc_dir = False self.used_abs_wc_dir = False self.used_url = False @@ -500,7 +500,7 @@ class TestFactory: else: py = "expected_stdout = verify.UnorderedOutput(" + pylist + ")\n\n" py += pychdir - py += "actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0" + py += "actions.run_and_verify_svn2(expected_stdout, [], 0" else: # write a test that expects failure pylist = self.strlist2py(err) @@ -509,8 +509,7 @@ class TestFactory: else: py = "expected_stderr = verify.UnorderedOutput(" + pylist + ")\n\n" py += pychdir - py += ("actions.run_and_verify_svn2('OUTPUT', " + - "[], expected_stderr, " + str(code)) + py += ("actions.run_and_verify_svn2([], expected_stderr, " + str(code)) if len(pyargs) > 0: py += ", " + ", ".join(pyargs) @@ -635,13 +634,13 @@ class TestFactory: py += pychdir py += ("actions.run_and_verify_update(" + wc.py + ", " + "expected_output, expected_disk, expected_status, " + - "None, None, None, None, None, False") + "[], False") else: # write a test that expects error py = "expected_error = " + self.strlist2py(err) + "\n\n" py += pychdir py += ("actions.run_and_verify_update(" + wc.py + ", None, None, " + - "None, expected_error, None, None, None, None, False") + "None, expected_error") if len(pyargs) > 0: py += ', ' + ', '.join(pyargs) @@ -701,14 +700,14 @@ class TestFactory: py += ("actions.run_and_verify_switch(" + wc.py + ", " + wc_arg.pyarg + ", " + url_arg.pyarg + ", " + "expected_output, expected_disk, expected_status, " + - "None, None, None, None, None, False") + "[], False") else: # write a test that expects error py = "expected_error = " + self.strlist2py(err) + "\n\n" py += pychdir py += ("actions.run_and_verify_switch(" + wc.py + ", " + wc_arg.pyarg + ", " + url_arg.pyarg + ", " + - "None, None, None, expected_error, None, None, None, None, False") + "None, None, None, expected_error, False") if len(pyargs) > 0: py += ', ' + ', '.join(pyargs) @@ -766,7 +765,7 @@ class TestFactory: py += ("actions.run_and_verify_checkout(" + url_arg.pyarg + ", " + wc_arg.pyarg + - ", expected_output, expected_disk, None, None, None, None") + ", expected_output, expected_disk") else: # write a test that expects failure pylist = self.strlist2py(err) @@ -775,8 +774,7 @@ class TestFactory: else: py += "expected_stderr = verify.UnorderedOutput(" + pylist + ")\n\n" py += pychdir - py += ("actions.run_and_verify_svn2('OUTPUT', " + - "[], expected_stderr, " + str(code) + + py += ("actions.run_and_verify_svn2([], expected_stderr, " + str(code) + ", " + url_arg.pyarg + ", " + wc_arg.pyarg) # Append the remaining args @@ -1037,7 +1035,7 @@ class TestFactory: make_py, prev_status = self.get_prev_status(wc) - actual_status = svntest.wc.State.from_status(output) + actual_status = svntest.wc.State.from_status(output, wc_dir=wc.realpath) # The tests currently compare SVNTreeNode trees, so let's do that too. prev_status_tree = prev_status.old_tree() |