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 2014/02/26 16:45:10 UTC

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

Author: philip
Date: Wed Feb 26 15:45:09 2014
New Revision: 1572102

URL: http://svn.apache.org/r1572102
Log:
Add an upgrade from 1.7 regression test that fails when working
copy exclusive locking is enabled.

* subversion/tests/cmdline/upgrade_tests.py
  (upgrade_1_7_dir_external): New test.
  (test_list): Add new test.

* subversion/tests/cmdline/upgrade_tests_data/upgrade_1_7_dir_external.tar.bz2:
  New.

Added:
    subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_1_7_dir_external.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=1572102&r1=1572101&r2=1572102&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Wed Feb 26 15:45:09 2014
@@ -1427,6 +1427,17 @@ def changelist_upgrade_1_6(sbox):
   if paths != expected_paths:
     raise svntest.Failure("changelist not matched")
 
+
+def upgrade_1_7_dir_external(sbox):
+  "upgrade from 1.7 with dir external"
+
+  sbox.build(create_wc = False)
+  replace_sbox_with_tarfile(sbox, 'upgrade_1_7_dir_external.tar.bz2')
+
+  # This fails for 'make check EXCLUSIVE_WC_LOCKS=1' giving an error:
+  # svn: warning: W200033: sqlite[S5]: database is locked
+  svntest.actions.run_and_verify_svn(None, None, [], 'upgrade', sbox.wc_dir)
+
 ########################################################################
 # Run the tests
 
@@ -1482,6 +1493,7 @@ test_list = [ None,
               iprops_upgrade,
               iprops_upgrade1_6,
               changelist_upgrade_1_6,
+              upgrade_1_7_dir_external,
              ]
 
 

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

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