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 2013/05/14 16:10:10 UTC

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

Author: philip
Date: Tue May 14 14:10:09 2013
New Revision: 1482338

URL: http://svn.apache.org/r1482338
Log:
Add a regression test for the SEGV fixed by r1482327.

* subversion/tests/cmdline/upgrade_tests.py
  (changelist_upgrade_1_6): New.
  (test_funcs): add new test.

* subversion/tests/cmdline/upgrade_tests_data/changelist_upgrade_1_6.tar.bz2:
  New file.

Added:
    subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/changelist_upgrade_1_6.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=1482338&r1=1482337&r2=1482338&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Tue May 14 14:10:09 2013
@@ -1408,6 +1408,23 @@ def iprops_upgrade1_6(sbox):
                     'iprops_upgrade_root1_6.tar.bz2',
                     sbox)
 
+def changelist_upgrade_1_6(sbox):
+  "upgrade from 1.6 with changelist"
+
+  sbox.build(create_wc = False)
+  svntest.main.run_svnadmin('setuuid', sbox.repo_dir,
+                            'aa4c97bd-2e1a-4e55-a1e5-3db22cff2673')
+  replace_sbox_with_tarfile(sbox, 'changelist_upgrade_1_6.tar.bz2')
+  svntest.actions.run_and_verify_svn(None, None, [], 'upgrade', sbox.wc_dir)
+
+  exit_code, output, errput = svntest.main.run_svn(None, 'info', sbox.wc_dir,
+                                                   '--depth', 'infinity',
+                                                   '--changelist', 'foo')
+  paths = [x for x in output if x[:6] == 'Path: ']
+  expected_paths = ['Path: %s\n' % sbox.ospath('A/D/gamma')]
+  if paths != expected_paths:
+    raise svntest.Failure("changelist not matched")
+
 ########################################################################
 # Run the tests
 
@@ -1462,6 +1479,7 @@ test_list = [ None,
               upgrade_from_1_7_conflict,
               iprops_upgrade,
               iprops_upgrade1_6,
+              changelist_upgrade_1_6,
              ]
 
 

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

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