[email protected] wrote on Mon, Dec 19, 2011 at 13:45:42 -0000: > Author: philip > Date: Mon Dec 19 13:45:42 2011 > New Revision: 1220742 > > URL: http://svn.apache.org/viewvc?rev=1220742&view=rev > Log: > * subversion/tests/cmdline/copy_tests.py > (changed_dir_data_should_match_checkout): Fix spurious FAIL by not > depending on status order. > > Modified: > subversion/trunk/subversion/tests/cmdline/copy_tests.py > > Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py > URL: > http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=1220742&r1=1220741&r2=1220742&view=diff > ============================================================================== > --- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original) > +++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Mon Dec 19 > 13:45:42 2011 > @@ -4654,9 +4654,15 @@ def changed_dir_data_should_match_checko > > os.chdir(was_cwd) > os.chdir(wc_dir) > - svntest.actions.run_and_verify_svn(None, verify_out, [], 'status', '-v') > + rv, verify_out2, err = main.run_svn (None, 'status', '-v')
Why not wrap VERIFY_OUT by an svntest.verify.UnorderedOutput() instance? > os.chdir(was_cwd) > > + # The order of the staus output is not absolutely defined, but > + # otherwise should match > + svntest.verify.verify_outputs(None, > + sorted(verify_out2), None, > + sorted(verify_out), None) > + > def move_added_nodes(sbox): > """move added nodes""" > > >
