svn commit: r1653987 - /subversion/branches/pin-externals/subversion/tests/cmdline/externals_tests.py

[st...@apache.org]

Author: stsp
Date: Thu Jan 22 18:13:47 2015
New Revision: 1653987

URL: http://svn.apache.org/r1653987
Log:
On the pin-externals branch, start putting some smarts into the regression
test for copy --pin-externals.

* subversion/tests/cmdline/externals_tests.py
  (pin_externals): Rename to ...
  (copy_pin_externals): ... this. Verify result of URL->URL copy with pinning.
  (test_list): Test was renamed.

Modified:
    subversion/branches/pin-externals/subversion/tests/cmdline/externals_tests.py

Modified: subversion/branches/pin-externals/subversion/tests/cmdline/externals_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/externals_tests.py?rev=1653987&r1=1653986&r2=1653987&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/branches/pin-externals/subversion/tests/cmdline/externals_tests.py Thu Jan 22 18:13:47 2015
@@ -3547,10 +3547,10 @@ def replace_tree_with_foreign_external(s
                                         None, None, None, None, None, 1,
                                         '-r', '2', wc_dir)
 
-def pin_externals(sbox):
+def copy_pin_externals(sbox):
   "test svn copy --pin-externals"
 
-  externals_test_setup(sbox)
+  external_url_for = externals_test_setup(sbox)
 
   wc_dir         = sbox.wc_dir
   repo_url       = sbox.repo_url
@@ -3563,6 +3563,36 @@ def pin_externals(sbox):
                                      '-m', 'copy',
                                      '--pin-externals')
 
+  # Verify that externals have been pinned.
+  def verify_pinned_externals():
+    expected_output = [
+      '-r1 %s@1 gamma\n' % external_url_for["A/B/gamma"],
+      '\n',
+    ]
+    svntest.actions.run_and_verify_svn(None, expected_output, [],
+                                       'propget', 'svn:externals',
+                                        repo_url + '/A_copy/B')
+    expected_output = [
+      '-r3 %s@3 exdir_G\n' % external_url_for["A/C/exdir_G"],
+      '-r1 %s exdir_H\n' % external_url_for["A/C/exdir_H"],
+      '\n',
+    ]
+    svntest.actions.run_and_verify_svn(None, expected_output, [],
+                                       'propget', 'svn:externals',
+                                        repo_url + '/A_copy/C')
+    expected_output = [
+      '-r5 %s@5 exdir_A\n' % external_url_for["A/D/exdir_A"],
+      '-r3 %s@3 exdir_A/G\n' % external_url_for["A/D/exdir_A/G/"],
+      '-r1 %s@1 exdir_A/H\n' % external_url_for["A/D/exdir_A/H"],
+      '-r4 %s@4 x/y/z/blah\n' % external_url_for["A/D/x/y/z/blah"],
+      '\n',
+    ]
+    svntest.actions.run_and_verify_svn(None, expected_output, [],
+                                       'propget', 'svn:externals',
+                                        repo_url + '/A_copy/D')
+    
+  verify_pinned_externals()
+
   # Create a working copy.
   svntest.actions.run_and_verify_svn(None, None, [],
                                      'checkout',
@@ -3634,7 +3664,7 @@ test_list = [ None,
               switch_relative_externals,
               copy_file_external_to_repo,
               replace_tree_with_foreign_external,
-              pin_externals,
+              copy_pin_externals,
              ]
 
 if __name__ == '__main__':