svn commit: r1294364 - /subversion/trunk/subversion/tests/cmdline/svnsync_tests.py

[gs...@apache.org]

Author: gstein
Date: Mon Feb 27 22:19:11 2012
New Revision: 1294364

URL: http://svn.apache.org/viewvc?rev=1294364&view=rev
Log:
Follow to r1294147: use a more Pythonic mechanism (generators) rather
than map/lambda.

* subversion/tests/cmdline/svnsync_tests.py:
  (basic_authz, copy_from_unreadable_dir,
      copy_with_mod_from_unreadable_dir,
      copy_with_mod_from_unreadable_dir_and_copy): use
    tuple(generator) rather than a map(lambda...) expression to
    simplify the construction.
  (copy_delete_unreadable_child): no need for map/lambda. just compute
    the authz name and pass it to the format expression.

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

Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests.py?rev=1294364&r1=1294363&r2=1294364&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnsync_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnsync_tests.py Mon Feb 27 22:19:11 2012
@@ -399,7 +399,7 @@ def basic_authz(sbox):
 
   run_init(dest_sbox.repo_url, sbox.repo_url)
 
-  args = map(lambda x: x.authz_name(), [sbox, sbox, dest_sbox])
+  args = tuple(s.authz_name() for s in [sbox, sbox, dest_sbox])
   svntest.main.file_write(sbox.authz_file,
                           "[%s:/]\n"
                           "* = r\n"
@@ -408,7 +408,7 @@ def basic_authz(sbox):
                           "* = \n"
                           "\n"
                           "[%s:/]\n"
-                          "* = rw\n" % tuple(args))
+                          "* = rw\n" % args)
 
   run_sync(dest_sbox.repo_url)
 
@@ -477,7 +477,7 @@ def copy_from_unreadable_dir(sbox):
 
   svntest.actions.enable_revprop_changes(dest_sbox.repo_dir)
 
-  args = map(lambda x: x.authz_name(), [sbox, sbox, dest_sbox])
+  args = tuple(s.authz_name() for s in [sbox, sbox, dest_sbox])
   open(sbox.authz_file, 'w').write(
              "[%s:/]\n"
              "* = r\n"
@@ -487,7 +487,7 @@ def copy_from_unreadable_dir(sbox):
              "\n"
              "[%s:/]\n"
              "* = rw"
-             % tuple(args))
+             % args)
 
   run_init(dest_sbox.repo_url, sbox.repo_url)
 
@@ -591,7 +591,7 @@ def copy_with_mod_from_unreadable_dir(sb
 
   svntest.actions.enable_revprop_changes(dest_sbox.repo_dir)
 
-  args = map(lambda x: x.authz_name(), [sbox, sbox, dest_sbox])
+  args = tuple(s.authz_name() for s in [sbox, sbox, dest_sbox])
   open(sbox.authz_file, 'w').write(
              "[%s:/]\n"
              "* = r\n"
@@ -601,7 +601,7 @@ def copy_with_mod_from_unreadable_dir(sb
              "\n"
              "[%s:/]\n"
              "* = rw"
-             % tuple(args))
+             % args)
 
   run_init(dest_sbox.repo_url, sbox.repo_url)
 
@@ -683,7 +683,7 @@ def copy_with_mod_from_unreadable_dir_an
 
   svntest.actions.enable_revprop_changes(dest_sbox.repo_dir)
 
-  args = map(lambda x: x.authz_name(), [sbox, sbox, dest_sbox])
+  args = tuple(s.authz_name() for s in [sbox, sbox, dest_sbox])
   open(sbox.authz_file, 'w').write(
              "[%s:/]\n"
              "* = r\n"
@@ -693,7 +693,7 @@ def copy_with_mod_from_unreadable_dir_an
              "\n"
              "[%s:/]\n"
              "* = rw"
-             % tuple(args))
+             % args)
 
   run_init(dest_sbox.repo_url, sbox.repo_url)
 
@@ -1005,7 +1005,7 @@ def fd_leak_sync_from_serf_to_local(sbox
 def copy_delete_unreadable_child(sbox):
   "copy, then rm at-src-unreadable child"
 
-  ## Prepare the source: Greek tree (r1), cp+rm (r2).
+  # Prepare the source: Greek tree (r1), cp+rm (r2).
   sbox.build("copy-delete-unreadable-child")
   svntest.actions.run_and_verify_svnmucc(None, None, [], 
                                          '-m', 'r2',
@@ -1013,21 +1013,20 @@ def copy_delete_unreadable_child(sbox):
                                          'cp', 'HEAD', '/', 'branch',
                                          'rm', 'branch/A')
 
-  ## Create the destination.
+  # Create the destination.
   dest_sbox = sbox.clone_dependent()
   build_repos(dest_sbox)
   svntest.actions.enable_revprop_changes(dest_sbox.repo_dir)
 
-  ## Lock down the source.
-  args = map(lambda x: x.authz_name(), [sbox, sbox])
+  # Lock down the source.
+  authz = sbox.authz_name()
   write_restrictive_svnserve_conf(sbox.repo_dir, anon_access='read')
   svntest.main.file_write(sbox.authz_file,
       "[%s:/]\n"
       "* = r\n"
       "[%s:/A]\n"
       "* =  \n"
-      % tuple(args)
-  )
+      % (authz, authz))
 
   dest_url = svntest.main.file_scheme_prefix \
              + svntest.main.pathname2url(os.path.abspath(dest_sbox.repo_dir))