automatically upgrade on startup if necessary

[disorder] / tests / dbversion.py

diff --git a/tests/dbversion.py b/tests/dbversion.py
index 945d7ad483057cb9a9a29d0a87d280c27bb6ac02..78788b1e0ca45a090bb3e5e5ef1e7ae082883c0e 100755 (executable)
--- a/tests/dbversion.py
+++ b/tests/dbversion.py
@@ -32,29 +32,10 @@ def test():
     dtest.stop_daemon()
     # Revert to default configuration
     dtest.copyfile(configsave, config)
+    print "Testing daemon manages to upgrade..."
     dtest.start_daemon()
-    time.sleep(2)
-    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)
+    time.sleep(4)
+    assert dtest.check_files() == 0
 
 if __name__ == '__main__':
     dtest.run()