You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/10/04 23:56:31 UTC
svn commit: r1706731 -
/subversion/trunk/subversion/tests/cmdline/patch_tests.py
Author: rhuijben
Date: Sun Oct 4 21:56:31 2015
New Revision: 1706731
URL: http://svn.apache.org/viewvc?rev=1706731&view=rev
Log:
Following up on r1706729, tweak more notifications on test that doesn't
work on Windows.
* subversion/tests/cmdline/patch_tests.py
(patch_symlink_traversal): Update expected results. Pass wc_dir to state
initializer instead of using deep paths.
Modified:
subversion/trunk/subversion/tests/cmdline/patch_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/patch_tests.py?rev=1706731&r1=1706730&r2=1706731&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/patch_tests.py Sun Oct 4 21:56:31 2015
@@ -5584,8 +5584,8 @@ def patch_symlink_traversal(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({'A/B/E/versioned' : Item(status='A ', wc_rev='-')})
expected_status.add({'A/B/versioned' : Item(status='A ', wc_rev='-')})
- expected_skip = wc.State('', {
- sbox.ospath('A/B/E/unversioned') : Item(verb='Skipped'),
+ expected_skip = wc.State(wc_dir, {
+ 'A/B/E/unversioned' : Item(verb='Skipped'),
})
svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
@@ -5612,13 +5612,13 @@ def patch_symlink_traversal(sbox):
"+xx\n"
)
- expected_output = [
- 'C %s\n' % sbox.ospath('A/B/E/versioned'),
- '> rejected hunk @@ -1,1 +1,2 @@\n',
- ] + svntest.main.summary_of_conflicts(text_conflicts=1)
- expected_disk.add({'A/B/E/versioned.svnpatch.rej'
- : Item(contents=reject_contents)})
- expected_skip = wc.State('', { })
+ expected_output = wc.State(wc_dir, {
+ 'A/B/E/versioned' : Item(status='C')
+ })
+ expected_disk.add({
+ 'A/B/E/versioned.svnpatch.rej' : Item(contents=reject_contents)
+ })
+ expected_skip = wc.State(wc_dir, { })
svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
expected_status, expected_skip)
@@ -5639,11 +5639,9 @@ def patch_symlink_traversal(sbox):
patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, unidiff_patch)
- expected_output = [
- 'Skipped missing target: \'%s\'\n' % sbox.ospath('A/B/unversioned/alpha'),
- ] + svntest.main.summary_of_conflicts(skipped_paths=1)
- expected_skip = wc.State('', {
- sbox.ospath('A/B/unversioned/alpha') : Item(verb='Skipped missing target'),
+ expected_output = wc.State(wc_dir, {})
+ expected_skip = wc.State(wc_dir, {
+ 'A/B/unversioned/alpha' : Item(verb='Skipped'),
})
svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,
@@ -5663,11 +5661,9 @@ def patch_symlink_traversal(sbox):
patch_file_path = sbox.get_tempname('my.patch')
svntest.main.file_write(patch_file_path, unidiff_patch)
- expected_output = [
- 'Skipped missing target: \'%s\'\n' % sbox.ospath('A/B/versioned/alpha'),
- ] + svntest.main.summary_of_conflicts(skipped_paths=1)
- expected_skip = wc.State('', {
- sbox.ospath('A/B/versioned/alpha') : Item(verb='Skipped missing target'),
+ expected_output = wc.State(wc_dir, {})
+ expected_skip = wc.State(wc_dir, {
+ 'A/B/versioned/alpha' : Item(verb='Skipped'),
})
svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
expected_output, expected_disk,