Complete Disobedience transition to event_ from _monitor.

[disorder] / tests / dbversion.py

diff --git a/tests/dbversion.py b/tests/dbversion.py
index 78788b1e0ca45a090bb3e5e5ef1e7ae082883c0e..218e0c9023056442f3cad13539c2859e5fb185c9 100755 (executable)
--- a/tests/dbversion.py
+++ b/tests/dbversion.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 #
 # This file is part of DisOrder.
 #! /usr/bin/env python
 #
 # This file is part of DisOrder.

-# Copyright (C) 2007 Richard Kettlewell
+# 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
 #
 # 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


@@ -28,14 +28,20 @@ def test():
     dtest.copyfile(config, configsave)
     open(config, "a").write("dbversion 1\n")
     dtest.start_daemon()
     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)
     dtest.stop_daemon()
     # Revert to default configuration
     dtest.copyfile(configsave, config)

-    print "Testing daemon manages to upgrade..."
+    print " testing daemon manages to upgrade..."

     dtest.start_daemon()
     dtest.start_daemon()

-    time.sleep(4)
-    assert dtest.check_files() == 0
+    assert dtest.check_files() == 0, "dtest.check_files"
+    print " getting server version"
+    c = disorder.client()
+    v = c.version()
+    print "Server version: %s" % v
+    print " getting server stats"
+    s = c.stats()

 
 if __name__ == '__main__':
     dtest.run()
 
 if __name__ == '__main__':
     dtest.run()