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

[rh...@apache.org]

Author: rhuijben
Date: Fri Aug 28 07:32:57 2015
New Revision: 1698271

URL: http://svn.apache.org/r1698271
Log:
Skip the svnfsfs test when testing with a prepackaged repository to avoid
testfailures on fsfs-v4 testruns. We probably need a more advanced skip
rule when we introduce new formats.

* subversion/tests/cmdline/svnadmin_tests.py
  (create_in_repo_subdir): Fix typo in skip rule.

* subversion/tests/cmdline/svnfsfs_tests.py
  (load_index_sharded): Apply skip rule.

* subversion/tests/cmdline/svntest/main.py
  (tests_use_prepacakaged_repository): Rename to...
  (tests_use_prepackaged_repository): ... this to fix typo.

Modified:
    subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
    subversion/trunk/subversion/tests/cmdline/svnfsfs_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=1698271&r1=1698270&r2=1698271&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Fri Aug 28 07:32:57 2015
@@ -1227,7 +1227,7 @@ def fsfs_recover_handle_missing_revs_or_
 
 #----------------------------------------------------------------------
 
-@Skip(svntest.main.tests_use_prepacakaged_repository)
+@Skip(svntest.main.tests_use_prepackaged_repository)
 def create_in_repo_subdir(sbox):
   "'svnadmin create /path/to/repo/subdir'"
 

Modified: subversion/trunk/subversion/tests/cmdline/svnfsfs_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnfsfs_tests.py?rev=1698271&r1=1698270&r2=1698271&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnfsfs_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnfsfs_tests.py Fri Aug 28 07:32:57 2015
@@ -98,6 +98,7 @@ def patch_format(repo_dir, shard_size):
 @SkipUnless(svntest.main.is_fs_type_fsfs)
 @SkipUnless(svntest.main.fs_has_pack)
 @SkipUnless(svntest.main.is_fs_log_addressing)
+@Skip(svntest.main.tests_use_prepackaged_repository)
 def load_index_sharded(sbox):
   "load-index in a packed repo"
 

Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1698271&r1=1698270&r2=1698271&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Fri Aug 28 07:32:57 2015
@@ -1416,7 +1416,7 @@ def make_log_msg():
 # Functions which check the test configuration
 # (useful for conditional XFails)
 
-def tests_use_prepacakaged_repository():
+def tests_use_prepackaged_repository():
   return options.fsfs_version is not None
 
 def tests_verify_dump_load_cross_check():