check server runs after upgrade

diff --git a/tests/dbversion.py b/tests/dbversion.py
index 945d7ad483057cb9a9a29d0a87d280c27bb6ac02..37e3b46ccf86f7a090a3cdc7372b73b41bc014da 100755 (executable)
--- a/tests/dbversion.py
+++ b/tests/dbversion.py
@@ -31,6 +31,7 @@ def test():
     time.sleep(2)
     dtest.stop_daemon()
     # Revert to default configuration
+    print "Checking daemon won't start with an old database"
     dtest.copyfile(configsave, config)
     dtest.start_daemon()
     time.sleep(2)
@@ -55,6 +56,10 @@ def test():
     if rc != 0:
         print "disorder-dbupgrade: FAILED: exit code %s" % rc
         sys.exit(1)
+    print "Testing daemon after upgrade..."
+    dtest.start_daemon()
+    time.sleep(2)
+    assert dtest.check_files() == 0
 
 if __name__ == '__main__':
     dtest.run()

diff --git a/tests/dtest.py b/tests/dtest.py
index 26fca75fe9dc803754affdd134579485271f0e86..00c5ead8b6af810ad727ca7195dfd8a47bb1874f 100644 (file)
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -253,6 +253,33 @@ Recursively delete directory D"""
         else:
             os.remove(d)
 
+def check_files():
+    c = disorder.client()
+    failures = 0
+    for d in dirs_by_dir:
+        xdirs = dirs_by_dir[d]
+        dirs = c.directories(d)
+        xdirs.sort()
+        dirs.sort()
+        if dirs != xdirs:
+            print
+            print "directory: %s" % d
+            print "expected:  %s" % xdirs
+            print "got:       %s" % dirs
+            failures += 1
+    for d in files_by_dir:
+        xfiles = files_by_dir[d]
+        files = c.files(d)
+        xfiles.sort()
+        files.sort()
+        if files != xfiles:
+            print
+            print "directory: %s" % d
+            print "expected:  %s" % xfiles
+            print "got:       %s" % files
+            failures += 1
+    return failures
+
 # -----------------------------------------------------------------------------
 # Common setup
 

diff --git a/tests/files.py b/tests/files.py
index 89375a66a50def6bb729be8fbdd96e95233baf7f..24d4ea458f5d3781dc66aaa67b059fef2fe91aaf 100755 (executable)
--- a/tests/files.py
+++ b/tests/files.py
@@ -23,34 +23,8 @@ import dtest,time,disorder,sys
 def test():
     """Check that the file listing comes out right"""
     dtest.start_daemon()
-    time.sleep(5)                       # give rescan a chance
-    c = disorder.client()
-    failures = 0
-    for d in dtest.dirs_by_dir:
-        xdirs = dtest.dirs_by_dir[d]
-        dirs = c.directories(d)
-        xdirs.sort()
-        dirs.sort()
-        if dirs != xdirs:
-            print
-            print "directory: %s" % d
-            print "expected:  %s" % xdirs
-            print "got:       %s" % dirs
-            failures += 1
-    for d in dtest.files_by_dir:
-        xfiles = dtest.files_by_dir[d]
-        files = c.files(d)
-        xfiles.sort()
-        files.sort()
-        if files != xfiles:
-            print
-            print "directory: %s" % d
-            print "expected:  %s" % xfiles
-            print "got:       %s" % files
-            failures += 1
-    if failures:
-        print
-        sys.exit(1)
+    time.sleep(2)                       # give rescan a chance
+    assert dtest.check_files() == 0
 
 if __name__ == '__main__':
     dtest.run()