From c4f8005867fb2bc2eab229457df174538fa61749 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Sun, 22 Feb 2009 17:28:55 -0700 Subject: [PATCH] remove more RuntimeError from unit tests, for #639 --- src/allmydata/test/check_memory.py | 7 +++++-- src/allmydata/test/no_network.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/allmydata/test/check_memory.py b/src/allmydata/test/check_memory.py index d476ad51..8994cb66 100644 --- a/src/allmydata/test/check_memory.py +++ b/src/allmydata/test/check_memory.py @@ -57,6 +57,9 @@ def discardPage(url, stall=False, *args, **kwargs): reactor.connectTCP(host, port, factory) return factory.deferred +class ChildDidNotStartError(Exception): + pass + class SystemFramework(pollmixin.PollMixin): numnodes = 5 @@ -274,7 +277,7 @@ this file are ignored. # the twistd process ends normally (with rc=0) if the child # is successfully launched. It ends abnormally (with rc!=0) # if the child cannot be launched. - raise RuntimeError("process ended while waiting for startup") + raise ChildDidNotStartError("process ended while waiting for startup") return os.path.exists(furl_file) d = self.poll(_check, 0.1) # once it exists, wait a moment before we read from it, just in case @@ -399,7 +402,7 @@ this file are ignored. d.addCallback(lambda res: u.upload(upload.FileName(files[name], convergence="check-memory convergence string"))) d.addCallback(lambda results: results.uri) else: - raise RuntimeError("unknown mode=%s" % self.mode) + raise ValueError("unknown mode=%s" % self.mode) def _complete(uri): uris[name] = uri print "uploaded %s" % name diff --git a/src/allmydata/test/no_network.py b/src/allmydata/test/no_network.py index f04228d5..731d7d99 100644 --- a/src/allmydata/test/no_network.py +++ b/src/allmydata/test/no_network.py @@ -115,7 +115,7 @@ class NoNetworkClient(Client): def stopService(self): service.MultiService.stopService(self) def when_tub_ready(self): - raise RuntimeError("NoNetworkClient has no Tub") + raise NotImplementedError("NoNetworkClient has no Tub") def init_control(self): pass def init_helper(self): -- 2.45.2