svn commit: r1588897 - /subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py

[st...@apache.org]

Author: stefan2
Date: Mon Apr 21 15:15:34 2014
New Revision: 1588897

URL: http://svn.apache.org/r1588897
Log:
Fix faulty completeness check in test suite after svnadmin hotcopy.

* subversion/tests/cmdline/svnadmin_tests.py
  (check_hotcopy_fsfs_fsx): Lock files are auto-create, thus, may be
                            missing on *either* side of the hotcopy.

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

Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1588897&r1=1588896&r2=1588897&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Mon Apr 21 15:15:34 2014
@@ -72,6 +72,14 @@ def check_hotcopy_fsfs_fsx(src, dst):
                               "destination" % dst_dirpath)
       # Verify that all dirents in the current directory also exist in source
       for dst_dirent in os.listdir(dst_dirpath):
+        # Ignore auto-created empty lock files as they may or may not
+        # be present and are neither required by nor do they harm to
+        # the destination repository.
+        if dst_dirent == 'pack-lock':
+          continue
+        if dst_dirent == 'write-lock':
+          continue
+
         src_dirent = os.path.join(src_dirpath, dst_dirent)
         if not os.path.exists(src_dirent):
           raise svntest.Failure("%s does not exist in hotcopy "