aboutsummaryrefslogtreecommitdiff
path: root/rpkid/tests
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2010-07-11 12:25:21 +0000
committerRob Austein <sra@hactrn.net>2010-07-11 12:25:21 +0000
commit937f0ae8085d78c2ee6816ef107e11ca5517c2e2 (patch)
treee7506cfdcdaa3b84fdfa39295c75c76024b2e15a /rpkid/tests
parenta0a725ccaf14eef16cbe92da06f3ef27ccea1f29 (diff)
Clean up uses of RuntimeError exception
svn path=/rpkid/irdbd.py; revision=3378
Diffstat (limited to 'rpkid/tests')
-rw-r--r--rpkid/tests/smoketest.py2
-rw-r--r--rpkid/tests/yamltest.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/rpkid/tests/smoketest.py b/rpkid/tests/smoketest.py
index 1d7dc266..44897929 100644
--- a/rpkid/tests/smoketest.py
+++ b/rpkid/tests/smoketest.py
@@ -83,7 +83,7 @@ for o, a in opts:
yaml_script = a
if argv:
print __doc__
- raise RuntimeError, "Unexpected arguments %s" % argv
+ raise rpki.exceptions.CommandParseFailure, "Unexpected arguments %s" % argv
cfg = rpki.config.parser(cfg_file, "smoketest", allow_missing = True)
diff --git a/rpkid/tests/yamltest.py b/rpkid/tests/yamltest.py
index 5f05d65f..8b8e87d6 100644
--- a/rpkid/tests/yamltest.py
+++ b/rpkid/tests/yamltest.py
@@ -543,11 +543,11 @@ for o, a in opts:
elif o in ("-p", "--pidfile"):
pidfile = a
-# We can't usefully process more than one YAMl file at a time, so
+# We can't usefully process more than one YAML file at a time, so
# whine if there's more than one argument left.
if len(argv) > 1:
- raise RuntimeError, "Unexpected arguments %r" % argv
+ raise rpki.exceptions.CommandParseFailure, "Unexpected arguments %r" % argv
try: