add test infrastructure, use 'make test' to run it, please run before pushing

diff --git a/.darcs-boringfile b/.darcs-boringfile
index 8b74fde3c7514a9a22e8e2e5ed4643401d2bc18d..580442585f356344966250783c1630c8e64ca6db 100644 (file)
--- a/.darcs-boringfile
+++ b/.darcs-boringfile
@@ -36,3 +36,4 @@
 
 ^client-basedir($|/)
 ^queen-basedir($|/)
+^_trial_temp($|/)

diff --git a/allmydata/client.py b/allmydata/client.py
index 12eb84c6e446eda0bc82ed77d1e1a04b35a7c735..d410dd9f1adef0e78d03fe7ea1ae9905778c4838 100644 (file)
--- a/allmydata/client.py
+++ b/allmydata/client.py
@@ -35,7 +35,8 @@ class Client(service.MultiService):
             log.msg("no queen_pburl, cannot connect")
 
     def stopService(self):
-        self.connector.stopConnecting()
+        if self.queen_pburl:
+            self.connector.stopConnecting()
 
     def _got_queen(self, queen):
         log.msg("connected to queen")

diff --git a/allmydata/queen.py b/allmydata/queen.py
index 338af2ca0fa27ce2a81b06a377640ab64291896a..ca667178fa3a32090457214143dfe9cbc3d915c4 100644 (file)
--- a/allmydata/queen.py
+++ b/allmydata/queen.py
@@ -22,8 +22,9 @@ class Queen(service.MultiService):
         self.urls = {}
         r = Roster()
         r.setServiceParent(self)
-        self.urls["roster"] = self.tub.registerReference(r, "roster")
+        #self.urls["roster"] = self.tub.registerReference(r, "roster")
 
     def startService(self):
         service.MultiService.startService(self)
-        log.msg("queen running, roster is at %s" % self.urls["roster"])
+        log.msg("queen running")
+        #log.msg(" roster is at %s" % self.urls["roster"])