svn commit: r1545968 - in /subversion/branches/log-addressing/subversion/tests/cmdline: svnadmin_tests.py svntest/main.py

[st...@apache.org]

Author: stefan2
Date: Wed Nov 27 09:15:45 2013
New Revision: 1545968

URL: http://svn.apache.org/r1545968
Log:
On the log-addressing branch:
Update recently merged test to handle f7 and fsx repositories as well.

* subversion/tests/cmdline/svntest/main.py
  (is_fs_log_addressing): Introduce new feature presence check.

* subversion/tests/cmdline/svnadmin_tests.py
  (verify_denormalized_names): FS' with logical addressing have an
                               additional verification stage.

Modified:
    subversion/branches/log-addressing/subversion/tests/cmdline/svnadmin_tests.py
    subversion/branches/log-addressing/subversion/tests/cmdline/svntest/main.py

Modified: subversion/branches/log-addressing/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/log-addressing/subversion/tests/cmdline/svnadmin_tests.py?rev=1545968&r1=1545967&r2=1545968&view=diff
==============================================================================
--- subversion/branches/log-addressing/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/branches/log-addressing/subversion/tests/cmdline/svnadmin_tests.py Wed Nov 27 09:15:45 2013
@@ -2175,6 +2175,9 @@ def verify_denormalized_names(sbox):
   if not svntest.main.is_fs_type_bdb():
     expected_output_regex_list.insert(0, ".*Verifying repository metadata")
 
+    if svntest.main.is_fs_log_addressing():
+      expected_output_regex_list.insert(0, ".* Verifying metadata at revision 0 ...")
+
   exp_out = svntest.verify.RegexListOutput(expected_output_regex_list)
 
   if svntest.verify.verify_outputs(

Modified: subversion/branches/log-addressing/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/branches/log-addressing/subversion/tests/cmdline/svntest/main.py?rev=1545968&r1=1545967&r2=1545968&view=diff
==============================================================================
--- subversion/branches/log-addressing/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/branches/log-addressing/subversion/tests/cmdline/svntest/main.py Wed Nov 27 09:15:45 2013
@@ -1336,6 +1336,10 @@ def is_fs_type_fsx():
 def is_fs_type_bdb():
   return options.fs_type == 'bdb'
 
+def is_fs_log_addressing():
+  return options.fs_type == 'fsx' or \
+        (is_fs_type_fsfs() and options.server_minor_version >= 9)
+
 def is_os_windows():
   return os.name == 'nt'