diff options
| author | Rob Austein <sra@hactrn.net> | 2013-04-19 02:22:57 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2013-04-19 02:22:57 +0000 |
| commit | ddfb8c4eb8139b94e1031c6f8555aee4b6287afb (patch) | |
| tree | 159b3fce49ac6594fc2ea0b1c327bdd973a990f0 /rpkid/tests/yamltest.py | |
| parent | de186b4393ce25cdfb51b1c3240e0326c85890cf (diff) | |
Add option to allow setting initial resource validity when configuring
child in rpkic, and teach yamltest to use it.
svn path=/trunk/; revision=5301
Diffstat (limited to 'rpkid/tests/yamltest.py')
| -rw-r--r-- | rpkid/tests/yamltest.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/rpkid/tests/yamltest.py b/rpkid/tests/yamltest.py index 6c950645..9d77a34c 100644 --- a/rpkid/tests/yamltest.py +++ b/rpkid/tests/yamltest.py @@ -486,7 +486,7 @@ class allocation(object): if profile: cmd.append("--profile") cmd.append(self.path("rpkic.%s.prof" % rpki.sundial.now())) - cmd.extend(a for a in args if a is not None) + cmd.extend(str(a) for a in args if a is not None) print 'Running "%s"' % " ".join(cmd) env = os.environ.copy() env["YAMLTEST_RPKIC_COUNTER"] = self.next_rpkic_counter() @@ -750,7 +750,9 @@ try: d.path("%s.repository-response.xml" % d.client_handle)) print else: - d.parent.run_rpkic("configure_child", d.path("%s.identity.xml" % d.name)) + d.parent.run_rpkic("configure_child", + "--valid_until", d.resources.valid_until, + d.path("%s.identity.xml" % d.name)) print d.run_rpkic("configure_parent", d.parent.path("%s.%s.parent-response.xml" % (d.parent.name, d.name))) |