From: Brian Warner <warner@lothar.com>
Date: Mon, 23 Feb 2009 00:28:55 +0000 (-0700)
Subject: remove more RuntimeError from unit tests, for #639
X-Git-Tag: allmydata-tahoe-1.4.0~141
X-Git-Url: https://git.rkrishnan.org/simplejson/components/com_hotproperty/cyclelanguage?a=commitdiff_plain;h=c4f8005867fb2bc2eab229457df174538fa61749;p=tahoe-lafs%2Ftahoe-lafs.git

remove more RuntimeError from unit tests, for #639
---

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):