Set resource limits on the server to prevent more than FD_SETSIZE

[disorder] / tests / dbversion.py

diff --git a/tests/dbversion.py b/tests/dbversion.py
index 37e3b46ccf86f7a090a3cdc7372b73b41bc014da..f3d429a122ab1caad97d7604d0364db81ab3c0ec 100755 (executable)
--- a/tests/dbversion.py
+++ b/tests/dbversion.py
@@ -1,22 +1,20 @@
 #! /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
+# 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
+# the Free Software Foundation, either version 3 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.
-#
+# 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
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 import dtest,time,disorder,sys,re,subprocess
 
@@ -28,38 +26,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
-    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()