You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2011/10/19 21:18:53 UTC

svn commit: r1186422 - in /subversion/trunk/subversion/tests/cmdline: upgrade_tests.py upgrade_tests_data/upgrade_not_present_replaced.tar.bz2

Author: philip
Date: Wed Oct 19 19:18:53 2011
New Revision: 1186422

URL: http://svn.apache.org/viewvc?rev=1186422&view=rev
Log:
Add a WIMP regression test for issue 4033, upgrade with not-present
replaced nodes.

[ in subversion/tests/cmdline/ ]

* upgrade_tests.py
  (upgrade_not_present_replaced): New test.
  (test_list): Add new test.

* upgrade_tests_data/upgrade_not_present_replaced.tar.bz2: New.

Added:
    subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_not_present_replaced.tar.bz2   (with props)
Modified:
    subversion/trunk/subversion/tests/cmdline/upgrade_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1186422&r1=1186421&r2=1186422&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Wed Oct 19 19:18:53 2011
@@ -1229,6 +1229,21 @@ def upgrade_missing_replaced(sbox):
   expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, 1)
   svntest.actions.run_and_verify_status(sbox.wc_dir, expected_status)
 
+@Issue(4033)
+@Wimp(4033)
+def upgrade_not_present_replaced(sbox):
+  "upgrade with not-present replaced nodes"
+
+  sbox.build(read_only=True)
+  replace_sbox_with_tarfile(sbox, 'upgrade_not_present_replaced.tar.bz2')
+
+  svntest.actions.run_and_verify_svn(None, None, [], 'upgrade', sbox.wc_dir)
+  svntest.main.run_svnadmin('setuuid', sbox.repo_dir,
+                            'd7130b12-92f6-45c9-9217-b9f0472c3fab')
+  svntest.actions.run_and_verify_svn(None, None, [], 'relocate',
+                                     'file:///tmp/repo', sbox.repo_url,
+                                     sbox.wc_dir)
+
 ########################################################################
 # Run the tests
 
@@ -1279,6 +1294,7 @@ test_list = [ None,
               upgrade_locked,
               upgrade_file_externals,
               upgrade_missing_replaced,
+              upgrade_not_present_replaced,
              ]
 
 

Added: subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_not_present_replaced.tar.bz2
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_not_present_replaced.tar.bz2?rev=1186422&view=auto
==============================================================================
Binary file - no diff available.

Propchange: subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_not_present_replaced.tar.bz2
------------------------------------------------------------------------------
    svn:mime-type = application/x-bzip2