X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/a4d8ba8f5aee04e305a1eb43d94bd97039f72167..802cbf55dcc8e329099f8aaa810e4174c7194d45:/tests/dbversion.py

diff --git a/tests/dbversion.py b/tests/dbversion.py
index 37e3b46..4ae71d7 100755
--- a/tests/dbversion.py
+++ b/tests/dbversion.py
@@ -28,38 +28,19 @@ def test():
     dtest.copyfile(config, configsave)
     open(config, "a").write("dbversion 1\n")
     dtest.start_daemon()
-    time.sleep(2)
+    dtest.create_user()
     dtest.stop_daemon()
     # Revert to default configuration
-    print "Checking daemon won't start with an old database"
     dtest.copyfile(configsave, config)
+    print " testing daemon manages to upgrade..."
     dtest.start_daemon()
-    time.sleep(2)
+    assert dtest.check_files() == 0, "dtest.check_files"
+    print " getting server version"
     c = disorder.client()
-    try:
-        v = c.version()
-        print "unexpected success"
-        ok = False
-    except disorder.communicationError, e:
-        if re.search("connection refused", str(e)):
-            print "unexpected error: %s" % e
-            ok = False
-        else:
-            ok = True
-    dtest.stop_daemon()
-    if not ok:
-        sys.exit(1)
-    # Try running the upgrade tool
-    print "Attempting an upgrade..."
-    rc = subprocess.call(["disorder-dbupgrade",
-                          "--config", "%s/config" % dtest.testroot])
-    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
+    v = c.version()
+    print "Server version: %s" % v
+    print " getting server stats"
+    s = c.stats()
 
 if __name__ == '__main__':
     dtest.run()