aboutsummaryrefslogtreecommitdiff
path: root/rpkid/tests/smoketest.py
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2012-04-15 05:59:24 +0000
committerRob Austein <sra@hactrn.net>2012-04-15 05:59:24 +0000
commit2e410abd46c2369fc9dbeaabf51f4ecd20809306 (patch)
treebced6af64aeaffe8313d6268576a80f13d0f4357 /rpkid/tests/smoketest.py
parent9e47a086b4e4c709aa0a04dd1ec4730f47120f03 (diff)
Forgot to take myrpki out of Makefile, oops, fixed. smoketest was
getting upset when trying to delete nonexistent SQL tables; have fixed this before, but apparently managed to break it again. svn path=/trunk/; revision=4418
Diffstat (limited to 'rpkid/tests/smoketest.py')
-rw-r--r--rpkid/tests/smoketest.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rpkid/tests/smoketest.py b/rpkid/tests/smoketest.py
index 3cb90d11..acc483c7 100644
--- a/rpkid/tests/smoketest.py
+++ b/rpkid/tests/smoketest.py
@@ -715,7 +715,7 @@ class allocation(object):
try:
cur.execute(sql)
except Exception:
- if not sql.upper().startswith("DROP TABLE"):
+ if "DROP TABLE IF EXISTS" not in sql.upper():
raise
db.close()
db = MySQLdb.connect(user = "irdb", db = self.irdb_db_name, passwd = irdb_db_pass)
@@ -725,7 +725,7 @@ class allocation(object):
try:
cur.execute(sql)
except Exception:
- if not sql.upper().startswith("DROP TABLE"):
+ if "DROP TABLE IF EXISTS" not in sql.upper():
raise
for s in [self] + self.hosts:
for kid in s.kids: