*** NOTE: This was a re-send of a prior commit message. ***
dlr@tigris.org wrote:
> Author: dlr
> Date: Mon Nov 12 09:21:30 2007
> New Revision: 27766
>
> Log:
> Use the SVNUnexpectedOutput, SVNUnexpectedStdout, and
> SVNUnexpectedStderr exception classes from the svntest.verify module,
> rather than referring to their old location in svntest.action. (They
> were moved to verify.py in r26716.)
>
> On test success there's no warning, but on test failure we get an
> AttributeError. This is really just a nit, because the exception
> classes are simply names.
>
> * subversion/tests/cmdline/import_tests.py
> (import_ignores): Reference exception from correct module name.
> * subversion/tests/cmdline/prop_tests.py
> (update_conflict_props): Ditto.
> (copy_inherits_special_props)
> * subversion/tests/cmdline/basic_tests.py
> (basic_add_ignores): Ditto.
> (basic_add_no_ignores): Ditto.
> * subversion/tests/cmdline/commit_tests.py
> (hook_test): Ditto.
> (start_commit_detect_capabilities): Ditto.
> * subversion/tests/cmdline/authz_tests.py
> (broken_authz_file): Ditto.
>
> Patch by: Stephen Butler <sbutler@elego.de>
>
>
> Modified:
> trunk/subversion/tests/cmdline/authz_tests.py
> trunk/subversion/tests/cmdline/basic_tests.py
> trunk/subversion/tests/cmdline/commit_tests.py
> trunk/subversion/tests/cmdline/import_tests.py
> trunk/subversion/tests/cmdline/prop_tests.py
>
> Modified: trunk/subversion/tests/cmdline/authz_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/authz_tests.py?pathrev=27766&r1=27765&r2=27766
> ==============================================================================
> --- trunk/subversion/tests/cmdline/authz_tests.py (original)
> +++ trunk/subversion/tests/cmdline/authz_tests.py Mon Nov 12 09:21:30 2007
> @@ -126,9 +126,9 @@
> sbox.repo_url + "/A",
> "-m", "a log message");
> if out:
> - raise svntest.actions.SVNUnexpectedStdout(out)
> + raise svntest.verify.SVNUnexpectedStdout(out)
> if not err:
> - raise svntest.actions.SVNUnexpectedStderr("Missing stderr")
> + raise svntest.verify.SVNUnexpectedStderr("Missing stderr")
>
> # test whether read access is correctly granted and denied
> def authz_read_access(sbox):
>
> Modified: trunk/subversion/tests/cmdline/basic_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/basic_tests.py?pathrev=27766&r1=27765&r2=27766
> ==============================================================================
> --- trunk/subversion/tests/cmdline/basic_tests.py (original)
> +++ trunk/subversion/tests/cmdline/basic_tests.py Mon Nov 12 09:21:30 2007
> @@ -1448,7 +1448,7 @@
> for line in output:
> # If we see foo.o in the add output, fail the test.
> if re.match(r'^A\s+.*foo.o$', line):
> - raise svntest.actions.SVNUnexpectedOutput
> + raise svntest.verify.SVNUnexpectedOutput
>
> # Else never matched the unwanted output, so the test passed.
>
> @@ -1500,7 +1500,7 @@
> for line in output:
> # If we don't see ignores in the add output, fail the test.
> if not re.match(r'^A\s+.*(foo.(o|rej|lo|c)|dir)$', line):
> - raise svntest.actions.SVNUnexpectedOutput
> + raise svntest.verify.SVNUnexpectedOutput
>
> #----------------------------------------------------------------------
> def basic_add_parents(sbox):
>
> Modified: trunk/subversion/tests/cmdline/commit_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/commit_tests.py?pathrev=27766&r1=27765&r2=27766
> ==============================================================================
> --- trunk/subversion/tests/cmdline/commit_tests.py (original)
> +++ trunk/subversion/tests/cmdline/commit_tests.py Mon Nov 12 09:21:30 2007
> @@ -854,7 +854,7 @@
> if os.path.exists(logfilename):
> fp = open(logfilename)
> else:
> - raise svntest.actions.SVNUnexpectedOutput("hook logfile %s not found")\
> + raise svntest.verify.SVNUnexpectedOutput("hook logfile %s not found")\
> % logfilename
>
> actual_data = fp.readlines()
> @@ -2533,7 +2533,7 @@
> data = open(log_path).read()
> os.unlink(log_path)
> else:
> - raise svntest.actions.SVNUnexpectedOutput("'%s' not found") % log_path
> + raise svntest.verify.SVNUnexpectedOutput("'%s' not found") % log_path
> if data != 'yes':
> raise svntest.Failure
>
>
> Modified: trunk/subversion/tests/cmdline/import_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/import_tests.py?pathrev=27766&r1=27765&r2=27766
> ==============================================================================
> --- trunk/subversion/tests/cmdline/import_tests.py (original)
> +++ trunk/subversion/tests/cmdline/import_tests.py Mon Nov 12 09:21:30 2007
> @@ -152,7 +152,7 @@
> match = cm.search (lastline)
> if not match:
> ### we should raise a less generic error here. which?
> - raise svntest.actions.SVNUnexpectedOutput
> + raise svntest.verify.SVNUnexpectedOutput
>
> # remove (uncontrolled) local dir
> svntest.main.safe_rmtree(dir_path)
>
> Modified: trunk/subversion/tests/cmdline/prop_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/prop_tests.py?pathrev=27766&r1=27765&r2=27766
> ==============================================================================
> --- trunk/subversion/tests/cmdline/prop_tests.py (original)
> +++ trunk/subversion/tests/cmdline/prop_tests.py Mon Nov 12 09:21:30 2007
> @@ -353,7 +353,7 @@
>
> if len(extra_files) != 0:
> print "didn't get expected conflict files"
> - raise svntest.actions.SVNUnexpectedOutput
> + raise svntest.verify.SVNUnexpectedOutput
>
> # Resolve the conflicts
> svntest.main.run_svn(None, 'resolved', mu_path)
> @@ -722,7 +722,7 @@
> print "svn pg svn:mime-type output does not match expected."
> print "Expected standard output: ", expected_stdout, "\n"
> print "Actual standard output: ", actual_stdout, "\n"
> - raise svntest.actions.SVNUnexpectedOutput
> + raise svntest.verify.SVNUnexpectedOutput
>
> # Check the svn:executable value.
> # The value of the svn:executable property is now always forced to '*'
> @@ -736,7 +736,7 @@
> print "svn pg svn:executable output does not match expected."
> print "Expected standard output: ", expected_stdout, "\n"
> print "Actual standard output: ", actual_stdout, "\n"
> - raise svntest.actions.SVNUnexpectedOutput
> + raise svntest.verify.SVNUnexpectedOutput
>
> #----------------------------------------------------------------------
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
>
--
C. Michael Pilato <cmpilato@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Received on Mon Nov 12 20:06:13 2007