X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/1c8f3db88212b2f4a5f79122af84f76b2c60da01..666130346faf921dfaa1a4d30f40ffe5354e14de:/tests/dbversion.py

diff --git a/tests/dbversion.py b/tests/dbversion.py
old mode 100644
new mode 100755
index 4e92611..218e0c9
--- a/tests/dbversion.py
+++ b/tests/dbversion.py
@@ -1,5 +1,24 @@
 #! /usr/bin/env python
-import dtest,time,disorder,sys,re
+#
+# This file is part of DisOrder.
+# Copyright (C) 2007, 2008 Richard Kettlewell
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+#
+import dtest,time,disorder,sys,re,subprocess
 
 def test():
     """Database version tests"""
@@ -9,26 +28,20 @@ def test():
     dtest.copyfile(config, configsave)
     open(config, "a").write("dbversion 1\n")
     dtest.start_daemon()
-    time.sleep(2)
+    dtest.create_user()
+    dtest.rescan()
     dtest.stop_daemon()
     # Revert to default configuration
     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)
+    v = c.version()
+    print "Server version: %s" % v
+    print " getting server stats"
+    s = c.stats()
 
 if __name__ == '__main__':
-    dtest.run(test)
+    dtest.run()