diff options
Diffstat (limited to 'rpkid/tests')
| -rw-r--r-- | rpkid/tests/smoketest.py | 8 | ||||
| -rw-r--r-- | rpkid/tests/testpoke.py | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/rpkid/tests/smoketest.py b/rpkid/tests/smoketest.py index bcb6d699..127e3f79 100644 --- a/rpkid/tests/smoketest.py +++ b/rpkid/tests/smoketest.py @@ -82,7 +82,7 @@ if yaml_script is None: yaml_script = cfg.get("yaml_script", "smoketest.yaml") try: yaml_script = [y for y in yaml.safe_load_all(open(yaml_script))] -except: +except Exception: print __doc__ raise @@ -704,7 +704,7 @@ class allocation(object): for sql in rpki_sql: try: cur.execute(sql) - except: + except Exception: if not sql.upper().startswith("DROP TABLE"): raise db.close() @@ -714,7 +714,7 @@ class allocation(object): for sql in irdb_sql: try: cur.execute(sql) - except: + except Exception: if not sql.upper().startswith("DROP TABLE"): raise for s in [self] + self.hosts: @@ -1170,7 +1170,7 @@ def setup_publication(pubd_sql): for sql in pubd_sql: try: cur.execute(sql) - except: + except Exception: if not sql.upper().startswith("DROP TABLE"): raise db.close() diff --git a/rpkid/tests/testpoke.py b/rpkid/tests/testpoke.py index 0e9c06cd..26cd29aa 100644 --- a/rpkid/tests/testpoke.py +++ b/rpkid/tests/testpoke.py @@ -12,7 +12,7 @@ Default configuration file is testpoke.yaml, override with --yaml option. $Id$ -Copyright (C) 2010 Internet Systems Consortium ("ISC") +Copyright (C) 2010--2011 Internet Systems Consortium ("ISC") Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -151,8 +151,7 @@ def do_revoke(): dispatch = { "list" : do_list, "issue" : do_issue, "revoke" : do_revoke } def fail(e): - if debug: - rpki.log.traceback() + rpki.log.traceback(debug) sys.exit("Testpoke failed: %s" % e) cms_ta = get_PEM("cms-ca-cert", rpki.x509.X509) |