svn commit: r1001814 - /subversion/trunk/subversion/tests/cmdline/upgrade_tests.py

[ph...@apache.org]

Author: philip
Date: Mon Sep 27 16:46:13 2010
New Revision: 1001814

URL: http://svn.apache.org/viewvc?rev=1001814&view=rev
Log:
Fix upgrade_tests.py 6 for SVN_WC__NODES_ONLY.

* subversion/tests/cmdline/upgrade_tests.py
  (check_dav_cache): Look at NODES if row not found in BASE_NODE, tweak
   failure message.

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

Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1001814&r1=1001813&r2=1001814&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Mon Sep 27 16:46:13 2010
@@ -108,13 +108,20 @@ def check_dav_cache(dir_path, wc_id, exp
   for local_relpath, expected_dav_cache in expected_dav_caches.items():
     c.execute('select dav_cache from base_node ' +
               'where wc_id=? and local_relpath=?',
-        (wc_id, local_relpath))
-    dav_cache = str(c.fetchone()[0])
-
+              (wc_id, local_relpath))
+    row = c.fetchone()
+    if row is None:
+      c.execute('select dav_cache from nodes ' +
+                'where wc_id=? and local_relpath=? and op_depth = 0',
+                (wc_id, local_relpath))
+      row = c.fetchone()
+    if row is None:
+      raise svntest.Failure("no dav cache for '%s'" % (local_relpath))
+    dav_cache = str(row[0])
     if dav_cache != expected_dav_cache:
       raise svntest.Failure(
               "wrong dav cache for '%s'\n  Found:    '%s'\n  Expected: '%s'" %
-                (dir_path, dav_cache, expected_dav_cache))
+                (local_relpath, dav_cache, expected_dav_cache))
 
   db.close()