> Finally, can you confirm that you have run the test suite ("make
> check")? I don't know whether there are any tests that would detect this
> change.
basic_tests.py 4 tries to update an unversioned path which leads to a
'skip'. Then a summary is printed which the test did not expect. I
thought that it would have printed a summary even without my patch? But
the test says different. What am I missing?
The test says this:
EXPECTED STDOUT:
Skipped 'svn-test-work/working_copies/basic_tests-4/xx/xx'
ACTUAL STDOUT:
Skipped 'svn-test-work/working_copies/basic_tests-4/xx/xx'
Summary of conflicts:
Skipped paths: 1
If the test should be changed, then I'm not the man for it. I tried
this:
Index: basic_tests.py
===================================================================
--- basic_tests.py (revision 38504)
+++ basic_tests.py (arbetskopia)
@@ -198,7 +198,8 @@
# path, are skipped and do not raise an error
xx_path = os.path.join(wc_dir, 'xx', 'xx')
exit_code, out, err = svntest.actions.run_and_verify_svn(
- "update xx/xx", ["Skipped '"+xx_path+"'\n"], [],
+ "update xx/xx",
+ ["Skipped '"+xx_path+"'\nSummary of conflicts:\n Skipped paths: 1\n"], [],
'update', xx_path)
exit_code, out, err = svntest.actions.run_and_verify_svn(
"update xx/xx", [], [],
but I got this:
EXPECTED STDOUT:
Skipped 'svn-test-work/working_copies/basic_tests-4/xx/xx'
Summary of conflicts:
Skipped paths: 1
ACTUAL STDOUT:
Skipped 'svn-test-work/working_copies/basic_tests-4/xx/xx'
Summary of conflicts:
Skipped paths: 1
EXCEPTION: SVNLineUnequal
The funny thing is that I can't spot any diff between the expected and
actual output. Line endings? Nothing shows up in vim. UTF-8?
Mvh
Daniel
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2377459
Received on 2009-07-31 17:46:05 CEST