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 2015/12/08 12:36:18 UTC

svn commit: r1718572 - /subversion/trunk/subversion/tests/cmdline/svnfsfs_tests.py

Author: philip
Date: Tue Dec  8 11:36:18 2015
New Revision: 1718572

URL: http://svn.apache.org/viewvc?rev=1718572&view=rev
Log:
Fix svnfsfs_tests.py --fsfs-sharding=N --fsfs-packing FAIL.

* subversion/tests/cmdline/svnfsfs_tests.py
  (load_index_sharded): Always pack because --fsfs-packing does not
   trigger packing in this particular test since r1 is created before
   the shard size is modified.

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

Modified: subversion/trunk/subversion/tests/cmdline/svnfsfs_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnfsfs_tests.py?rev=1718572&r1=1718571&r2=1718572&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnfsfs_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnfsfs_tests.py Tue Dec  8 11:36:18 2015
@@ -248,12 +248,9 @@ def load_index_sharded(sbox):
   sbox.build(create_wc=False)
   patch_format(sbox.repo_dir, shard_size=2)
 
-  # With --fsfs-packing, everything is already packed and we
-  # can skip this part.
-  if not svntest.main.options.fsfs_packing:
-    expected_output = ["Packing revisions in shard 0...done.\n"]
-    svntest.actions.run_and_verify_svnadmin(expected_output, [],
-                                            "pack", sbox.repo_dir)
+  expected_output = ["Packing revisions in shard 0...done.\n"]
+  svntest.actions.run_and_verify_svnadmin(expected_output, [],
+                                          "pack", sbox.repo_dir)
 
   # Read P2L index using svnfsfs.
   exit_code, items, errput = \