diff options
author | Rob Austein <sra@hactrn.net> | 2008-09-23 15:27:48 +0000 |
---|---|---|
committer | Rob Austein <sra@hactrn.net> | 2008-09-23 15:27:48 +0000 |
commit | 35ef50d4561e9af0d321e85254090b0750229c72 (patch) | |
tree | 92153d274e2ed9129d1342eeb9f481e173707d90 /rpkid/testbed.py | |
parent | a4a9666e001a9838e4d5b49ca1ccaa23aedf4108 (diff) |
Don't abort test when "testpoke.py -r issue" fails.
svn path=/rpkid/testbed.py; revision=2006
Diffstat (limited to 'rpkid/testbed.py')
-rw-r--r-- | rpkid/testbed.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/rpkid/testbed.py b/rpkid/testbed.py index 9be8aae3..2b095c1c 100644 --- a/rpkid/testbed.py +++ b/rpkid/testbed.py @@ -723,10 +723,16 @@ class allocation(object): msg = "Run cron now, please") def run_yaml(self): - """Run YAML scripts for this leaf entity.""" + """Run YAML scripts for this leaf entity. Since we're not + bothering to check the class list returned by the list command, + the issue command may fail, so we treat failure of the list + command as an error, but only issue a warning when issue fails. + """ + rpki.log.info("Running YAML for %s" % self.name) subprocess.check_call((prog_python, prog_poke, "-y", self.name + ".yaml", "-r", "list")) - subprocess.check_call((prog_python, prog_poke, "-y", self.name + ".yaml", "-r", "issue")) + if subprocess.call((prog_python, prog_poke, "-y", self.name + ".yaml", "-r", "issue")) != 0: + rpki.log.warn("YAML issue command failed for %s, continuing" % self.name) def setup_bpki_cert_chain(name, ee = (), ca = ()): """Build a set of BPKI certificates.""" |