svn commit: r1898536 - in /subversion/trunk/subversion/tests/cmdline: svntest/sandbox.py upgrade_tests.py

[ju...@apache.org]

Author: julianfoad
Date: Wed Mar  2 21:16:10 2022
New Revision: 1898536

URL: http://svn.apache.org/viewvc?rev=1898536&view=rev
Log:
Multi-WC-format: Factor out a useful test method.

* subversion/tests/cmdline/svntest/sandbox.py
  (Sandbox.read_wc_format): New method, extracted...

* subversion/tests/cmdline/upgrade_tests.py
  (check_format): ... from here, dropping some pre-WC-NG dead code.

Modified:
    subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py
    subversion/trunk/subversion/tests/cmdline/upgrade_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py?rev=1898536&r1=1898535&r2=1898536&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py Wed Mar  2 21:16:10 2022
@@ -600,6 +600,15 @@ class Sandbox:
                        self.read_only and "true" or "false"))
     pass
 
+  def read_wc_format(self):
+    dot_svn = svntest.main.get_admin_name()
+    db = svntest.sqlite3.connect(os.path.join(self.wc_dir, dot_svn, 'wc.db'))
+    c = db.cursor()
+    c.execute('pragma user_version;')
+    found_format = c.fetchone()[0]
+    db.close()
+    return found_format
+
 def is_url(target):
   return (target.startswith('^/')
           or target.startswith('file://')

Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1898536&r1=1898535&r2=1898536&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Wed Mar  2 21:16:10 2022
@@ -97,22 +97,10 @@ def replace_sbox_repo_with_tarfile(sbox,
   shutil.move(os.path.join(extract_dir, dir), sbox.repo_dir)
 
 def check_format(sbox, expected_format):
-  dot_svn = svntest.main.get_admin_name()
-  for root, dirs, files in os.walk(sbox.wc_dir):
-    db = svntest.sqlite3.connect(os.path.join(root, dot_svn, 'wc.db'))
-    c = db.cursor()
-    c.execute('pragma user_version;')
-    found_format = c.fetchone()[0]
-    db.close()
-
-    if found_format != expected_format:
-      raise svntest.Failure("found format '%d'; expected '%d'; in wc '%s'" %
-                            (found_format, expected_format, root))
-
-    dirs[:] = []
-
-    if dot_svn in dirs:
-      dirs.remove(dot_svn)
+  found_format = sbox.read_wc_format()
+  if found_format != expected_format:
+    raise svntest.Failure("found format '%d'; expected '%d'; in wc '%s'" %
+                          (found_format, expected_format, sbox.wc_dir))
 
 def check_pristine(sbox, files):
   for file in files: