From a4d8ba8f5aee04e305a1eb43d94bd97039f72167 Mon Sep 17 00:00:00 2001
Message-Id: <a4d8ba8f5aee04e305a1eb43d94bd97039f72167.1713576592.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Wed, 21 Nov 2007 19:20:15 +0000
Subject: [PATCH] check server runs after upgrade
Organization: Straylight/Edgeware

From: Richard Kettlewell <rjk@greenend.org.uk>

---
 tests/dbversion.py |  5 +++++
 tests/dtest.py     | 27 +++++++++++++++++++++++++++
 tests/files.py     | 30 ++----------------------------
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/tests/dbversion.py b/tests/dbversion.py
index 945d7ad..37e3b46 100755
--- 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 26fca75..00c5ead 100644
--- 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 89375a6..24d4ea4 100755
--- 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()
-- 
[mdw]