svn commit: r1817028 - in /subversion/trunk/subversion/tests/cmdline: svnadmin_tests.py svntest/main.py

[st...@apache.org]

Author: stefan2
Date: Sun Dec  3 11:33:02 2017
New Revision: 1817028

URL: http://svn.apache.org/viewvc?rev=1817028&view=rev
Log:
Fix test expectations for rep sharing with BDB.

BDB *does* support rep sharing as well, so test it. The only difference
to FSFS and FSX is that there is no metadata verification.

This fixes the test failures as of r1816967 with BDB.

* subversion/tests/cmdline/svnadmin_tests.py
  (verify_windows_paths_in_repos,
   verify_denormalized_names): BDB never performs metadata verification.

* subversion/tests/cmdline/svntest/main.py
  (fs_has_rep_sharing): Rep sharing is available for all backends since 1.6.

Modified:
    subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
    subversion/trunk/subversion/tests/cmdline/svntest/main.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=1817028&r1=1817027&r2=1817028&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Sun Dec  3 11:33:02 2017
@@ -746,7 +746,7 @@ def verify_windows_paths_in_repos(sbox):
                  "* Verified revision 0.\n",
                  "* Verified revision 1.\n",
                  "* Verified revision 2.\n"], output)
-  elif svntest.main.fs_has_rep_sharing():
+  elif svntest.main.fs_has_rep_sharing() and not svntest.main.is_fs_type_bdb():
     svntest.verify.compare_and_display_lines(
       "Error while running 'svnadmin verify'.",
       'STDOUT', ["* Verifying repository metadata ...\n",
@@ -2525,7 +2525,7 @@ def verify_denormalized_names(sbox):
     ".*Verified revision 7."]
 
   # The BDB backend doesn't do global metadata verification.
-  if (svntest.main.fs_has_rep_sharing()):
+  if (svntest.main.fs_has_rep_sharing() and not svntest.main.is_fs_type_bdb()):
     expected_output_regex_list.insert(0, ".*Verifying repository metadata.*")
 
   if svntest.main.options.fsfs_sharding is not None:

Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1817028&r1=1817027&r2=1817028&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Sun Dec  3 11:33:02 2017
@@ -1578,8 +1578,7 @@ def fs_has_sha1():
   return fs_has_rep_sharing()
 
 def fs_has_rep_sharing():
-  return is_fs_type_fsx() or \
-        (is_fs_type_fsfs() and options.server_minor_version >= 6)
+  return options.server_minor_version >= 6
 
 def fs_has_pack():
   return is_fs_type_fsx() or \