subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1031507 - /subversion/trunk/subversion/tests/cmdline/copy_tests.py
Date Fri, 05 Nov 2010 10:51:44 GMT
Author: julianfoad
Date: Fri Nov  5 10:51:43 2010
New Revision: 1031507

URL: http://svn.apache.org/viewvc?rev=1031507&view=rev
Log:
Try again to un-break the Python syntax I used in r1031411. (Using keyword args
after *tuple args requires Python 2.6.)

* subversion/tests/cmdline/copy_tests.py
  (A_B_children, A_D_children): Change these back to arrays.
  (copy_repos_over_deleted_same_kind,
   copy_repos_over_deleted_other_kind,
   copy_wc_over_deleted_same_kind,
   copy_wc_over_deleted_other_kind): Iterate rather than trying
    to unpack an array or tuple before keyword arguments.

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=1031507&r1=1031506&r2=1031507&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Fri Nov  5 10:51:43 2010
@@ -4835,9 +4835,9 @@ def delete_replace_delete(sbox):
   # Currently fails because pi, rho, tau get left behind
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
-A_B_children = ('A/B/lambda', 'A/B/F', 'A/B/E/alpha', 'A/B/E/beta', 'A/B/E')
-A_D_children = ('A/D/gamma', 'A/D/G', 'A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau',
-                'A/D/H', 'A/D/H/chi', 'A/D/H/psi', 'A/D/H/omega')
+A_B_children = ['A/B/lambda', 'A/B/F', 'A/B/E/alpha', 'A/B/E/beta', 'A/B/E']
+A_D_children = ['A/D/gamma', 'A/D/G', 'A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau',
+                'A/D/H', 'A/D/H/chi', 'A/D/H/psi', 'A/D/H/omega']
 
 def copy_repos_over_deleted_same_kind(sbox):
   "copy repos node over deleted node, same kind"
@@ -4846,7 +4846,8 @@ def copy_repos_over_deleted_same_kind(sb
   expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, 1)
   main.run_svn(None, 'rm', os.path.join(sbox.wc_dir, 'iota'),
                            os.path.join(sbox.wc_dir, 'A/B'))
-  expected_status.tweak('iota', 'A/B', *A_B_children, status='D ')
+  for path in ['iota', 'A/B'] + A_B_children:
+    expected_status.tweak(path, status='D ')
   main.run_svn(None, 'cp', sbox.repo_url + '/A/mu',
                os.path.join(sbox.wc_dir, 'iota'))
   expected_status.tweak('iota', status='R ', wc_rev='-', copied='+')
@@ -4865,7 +4866,8 @@ def copy_repos_over_deleted_other_kind(s
   expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, 1)
   main.run_svn(None, 'rm', os.path.join(sbox.wc_dir, 'iota'),
                            os.path.join(sbox.wc_dir, 'A/B'))
-  expected_status.tweak('iota', 'A/B', *A_B_children, status='D ')
+  for path in ['iota', 'A/B'] + A_B_children:
+    expected_status.tweak(path, status='D ')
   main.run_svn(None, 'cp', sbox.repo_url + '/iota',
                os.path.join(sbox.wc_dir, 'A/B'))
   expected_status.tweak('A/B', status='R ', wc_rev='-', copied='+')
@@ -4885,7 +4887,8 @@ def copy_wc_over_deleted_same_kind(sbox)
   expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, 1)
   main.run_svn(None, 'rm', os.path.join(sbox.wc_dir, 'iota'),
                            os.path.join(sbox.wc_dir, 'A/B'))
-  expected_status.tweak('iota', 'A/B', *A_B_children, status='D ')
+  for path in ['iota', 'A/B'] + A_B_children:
+    expected_status.tweak(path, status='D ')
   main.run_svn(None, 'cp', os.path.join(sbox.wc_dir, 'A/mu'),
                os.path.join(sbox.wc_dir, 'iota'))
   expected_status.tweak('iota', status='R ', wc_rev='-', copied='+')
@@ -4904,7 +4907,8 @@ def copy_wc_over_deleted_other_kind(sbox
   expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, 1)
   main.run_svn(None, 'rm', os.path.join(sbox.wc_dir, 'iota'),
                            os.path.join(sbox.wc_dir, 'A/B'))
-  expected_status.tweak('iota', 'A/B', *A_B_children, status='D ')
+  for path in ['iota', 'A/B'] + A_B_children:
+    expected_status.tweak(path, status='D ')
   main.run_svn(None, 'cp', os.path.join(sbox.wc_dir, 'A/mu'),
                os.path.join(sbox.wc_dir, 'A/B'))
   expected_status.tweak('A/B', status='R ', wc_rev='-', copied='+')



Mime
View raw message