Author: rhuijben
Date: Thu Jul 29 08:47:33 2010
New Revision: 980362
URL: http://svn.apache.org/viewvc?rev=980362&view=rev
Log:
Update entries test to check for different expected values in single-db
and without single-db mode. Add a temporary helper function that guesses if
single-db is used, which should be safe for any working copy containing at least
a file with pristine test
* subversion/tests/cmdline/entries_tests.py
(obstructed_entries): Update expected values for single-db.
* subversion/tests/cmdline/svntest/main.py
(wc_is_singledb): New function.
Modified:
subversion/trunk/subversion/tests/cmdline/entries_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/main.py
Modified: subversion/trunk/subversion/tests/cmdline/entries_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/entries_tests.py?rev=980362&r1=980361&r2=980362&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/entries_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/entries_tests.py Thu Jul 29
08:47:33 2010
@@ -182,7 +182,12 @@ def obstructed_entries(sbox):
entries = svntest.main.run_entriesdump(D_path)
check_names(entries, 'H')
- validate(entries['H'], revision=-1)
+
+ if svntest.main.wc_is_singledb(wc_dir):
+ # Data is not missing in single-db
+ validate(entries['H'], revision=1)
+ else:
+ validate(entries['H'], revision=-1)
### need to get svn_wc__db_read_info() to generate obstructed_add
Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=980362&r1=980361&r2=980362&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Thu Jul 29
08:47:33 2010
@@ -269,6 +269,22 @@ def get_admin_name():
else:
return '.svn'
+def wc_is_singledb(wcpath):
+ """Temporary function that checks whether a working copy directory looks
+ like it is part of a single-db working copy."""
+
+ pristine = os.path.join(wcpath, get_admin_name(), 'pristine')
+ if not os.path.exists(pristine):
+ return True
+
+ for name in os.listdir(pristine):
+ if len(name) == 2:
+ return True
+ elif len(name) == 40:
+ return False
+
+ return False
+
def get_start_commit_hook_path(repo_dir):
"Return the path of the start-commit-hook conf file in REPO_DIR."
