subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1839739 - in /subversion/trunk/subversion/tests/cmdline: svnadmin_tests.py svntest/main.py svntest/wc.py
Date Fri, 31 Aug 2018 09:32:31 GMT
Author: rhuijben
Date: Fri Aug 31 09:32:31 2018
New Revision: 1839739

URL: http://svn.apache.org/viewvc?rev=1839739&view=rev
Log:
* subversion/tests/cmdline/svnadmin_tests.py
  (recover_prunes_rep_cache_when_enabled,
   recover_prunes_rep_cache_when_disabled): Update SkipUnless.

* subversion/tests/cmdline/svntest/main.py
  (python_sqlite_can_read_our_db): Rename to...
  (python_sqlite_can_read_our_wc_db): ... this.
  
  (is_fs_type_fsfs_and_sqlite_can_read_our_db): Remove function.
  (python_sqlite_can_read_without_rowid): New function.
  
* subversion/tests/cmdline/svntest/wc.py
  (python_sqlite_can_read_wc): Update caller.

Modified:
    subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
    subversion/trunk/subversion/tests/cmdline/svntest/main.py
    subversion/trunk/subversion/tests/cmdline/svntest/wc.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=1839739&r1=1839738&r2=1839739&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Fri Aug 31 09:32:31 2018
@@ -3896,7 +3896,8 @@ def check_recover_prunes_rep_cache(sbox,
   assert rep_cache_recovered == rep_cache_r1
 
 @Issue(4077)
-@SkipUnless(svntest.main.is_fs_type_fsfs_and_sqlite_can_read_our_db)
+@SkipUnless(svntest.main.is_fs_type_fsfs)
+@SkipUnless(svntest.main.python_sqlite_can_read_without_rowid)
 def recover_prunes_rep_cache_when_enabled(sbox):
   "recover prunes rep cache when enabled"
   sbox.build()
@@ -3904,7 +3905,8 @@ def recover_prunes_rep_cache_when_enable
   check_recover_prunes_rep_cache(sbox, enable_rep_sharing=True)
 
 @Issue(4077)
-@SkipUnless(svntest.main.is_fs_type_fsfs_and_sqlite_can_read_our_db)
+@SkipUnless(svntest.main.is_fs_type_fsfs)
+@SkipUnless(svntest.main.python_sqlite_can_read_without_rowid)
 def recover_prunes_rep_cache_when_disabled(sbox):
   "recover prunes rep cache when disabled"
   sbox.build()

Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1839739&r1=1839738&r2=1839739&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Fri Aug 31 09:32:31 2018
@@ -1642,13 +1642,14 @@ def server_has_atomic_revprop():
 def server_has_reverse_get_file_revs():
   return options.server_caps.has_reverse_get_file_revs
 
-def python_sqlite_can_read_our_db():
+def python_sqlite_can_read_our_wc_db():
   """Check if the Python builtin is capable enough to peek into wc.db"""
   # Currently enough (1.7-1.9)
   return svntest.sqlite3.sqlite_version_info >= (3, 6, 18)
 
-def is_fs_type_fsfs_and_sqlite_can_read_our_db():
-  return is_fs_type_fsfs() and python_sqlite_can_read_our_db()
+def python_sqlite_can_read_without_rowid():
+  """Check if the Python builtin is capable enough to read new rep-cache"""
+  return svntest.sqlite3.sqlite_version_info >= (3, 8, 2)
 
 def is_plaintext_password_storage_disabled():
   try:

Modified: subversion/trunk/subversion/tests/cmdline/svntest/wc.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/wc.py?rev=1839739&r1=1839738&r2=1839739&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/wc.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/wc.py Fri Aug 31 09:32:31 2018
@@ -1092,7 +1092,7 @@ def svn_uri_quote(url):
 
 def python_sqlite_can_read_wc():
   """Check if the Python builtin is capable enough to peek into wc.db"""
-  return svntest.main.python_sqlite_can_read_our_db()
+  return svntest.main.python_sqlite_can_read_our_wc_db()
 
 def open_wc_db(local_path):
   """Open the SQLite DB for the WC path LOCAL_PATH.



Mime
View raw message