svn commit: r1452272 - /subversion/trunk/subversion/tests/cmdline/move_tests.py

[ph...@apache.org]

Author: philip
Date: Mon Mar  4 12:16:14 2013
New Revision: 1452272

URL: http://svn.apache.org/r1452272
Log:
Fix a test that was failing due to an error in the test.

* subversion/tests/cmdline/move_tests.py
  (prop_test1): Set correct property, adjust expectations, remove XFail.

Modified:
    subversion/trunk/subversion/tests/cmdline/move_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/move_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/move_tests.py?rev=1452272&r1=1452271&r2=1452272&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/move_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/move_tests.py Mon Mar  4 12:16:14 2013
@@ -1027,7 +1027,6 @@ def deeper_move_file_test(sbox):
   move_file_tests(sbox, source, dest, move_func, tests)
 
 
-@XFail()
 def prop_test1(sbox):
   "test property merging on move-update"
 
@@ -1063,7 +1062,7 @@ def prop_test1(sbox):
                       'A/C/f3')
   sbox.simple_propset('key1', 'value3',
                       'A/C/D4', 'A/C/D5',
-                      'A/C/f3', 'A/C/f5')
+                      'A/C/f4', 'A/C/f5')
   sbox.simple_commit()
   sbox.simple_update('', 2)
   sbox.simple_propset('key1', 'value2',
@@ -1109,7 +1108,8 @@ def prop_test1(sbox):
                         'A/C2/D1', 'A/C2/D2', 'A/C2/D3', 'A/C2/D4', 'A/C2/D5',
                         'A/C2/f1', 'A/C2/f2', 'A/C2/f3', 'A/C2/f4', 'A/C2/f5',
                         wc_rev='-')
-  expected_status.tweak('A/C2/D3', 'A/C2/D3',
+  expected_status.tweak('A/C2/D3',
+                        'A/C2/f3',
                         status='  ')
   expected_status.tweak('A/C2/D4', 'A/C2/D5',
                         'A/C2/f4', 'A/C2/f5',