From: Brian Warner Date: Thu, 30 Nov 2006 22:55:26 +0000 (-0700) Subject: add test infrastructure, use 'make test' to run it, please run before pushing X-Git-Tag: tahoe_v0.1.0-0-UNSTABLE~540 X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty/css/status?a=commitdiff_plain;h=efeea5e5e7f7c9714f512dc3a56545c57329596f;p=tahoe-lafs%2Ftahoe-lafs.git add test infrastructure, use 'make test' to run it, please run before pushing --- diff --git a/.darcs-boringfile b/.darcs-boringfile index 8b74fde3..58044258 100644 --- 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 12eb84c6..d410dd9f 100644 --- 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 338af2ca..ca667178 100644 --- 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"])