Author: rhuijben
Date: Fri Aug 31 09:00:05 2018
New Revision: 1839734
URL: http://svn.apache.org/viewvc?rev=1839734&view=rev
Log:
Another attempt at properly skipping a few tests that certain
configurations can't handle.
* cmdline/svnadmin_tests.py
(recover_prunes_rep_cache_when_enabled,
recover_prunes_rep_cache_when_disabled): Use single SkipUnless
* cmdline/svntest/main.py
(python_sqlite_can_read_our_db,
is_fs_type_fsfs_and_sqlite_can_read_our_db): New functions based on...
* cmdline/svntest/wc.py
(python_sqlite_can_read_wc): ... this function, which is now a proxy.
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=1839734&r1=1839733&r2=1839734&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Fri Aug 31
09:00:05 2018
@@ -38,7 +38,6 @@ logger = logging.getLogger()
# Our testing module
import svntest
-from svntest import wc
from svntest.verify import SVNExpectedStdout, SVNExpectedStderr
from svntest.verify import SVNUnexpectedStderr
from svntest.verify import UnorderedOutput
@@ -3897,8 +3896,7 @@ def check_recover_prunes_rep_cache(sbox,
assert rep_cache_recovered == rep_cache_r1
@Issue(4077)
-@SkipUnless(svntest.main.is_fs_type_fsfs)
-@SkipUnless(svntest.wc.python_sqlite_can_read_wc)
+@SkipUnless(svntest.main.is_fs_type_fsfs_and_sqlite_can_read_our_db)
def recover_prunes_rep_cache_when_enabled(sbox):
"recover prunes rep cache when enabled"
sbox.build()
@@ -3906,8 +3904,7 @@ 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)
-@SkipUnless(svntest.wc.python_sqlite_can_read_wc)
+@SkipUnless(svntest.main.is_fs_type_fsfs_and_sqlite_can_read_our_db)
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=1839734&r1=1839733&r2=1839734&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Fri Aug 31
09:00:05 2018
@@ -1642,6 +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():
+ """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 is_plaintext_password_storage_disabled():
try:
predicate = re.compile("^WARNING: Plaintext password storage is enabled!")
Modified: subversion/trunk/subversion/tests/cmdline/svntest/wc.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/wc.py?rev=1839734&r1=1839733&r2=1839734&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/wc.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/wc.py Fri Aug 31 09:00:05
2018
@@ -1092,8 +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"""
- # Currently enough (1.7-1.9)
- return svntest.sqlite3.sqlite_version_info >= (3, 6, 18)
+ return svntest.main.python_sqlite_can_read_our_db()
def open_wc_db(local_path):
"""Open the SQLite DB for the WC path LOCAL_PATH.
