diff options
Diffstat (limited to 'rpkid/tests')
| -rw-r--r-- | rpkid/tests/smoketest.py | 5 | ||||
| -rw-r--r-- | rpkid/tests/sql-cleaner.py | 2 | ||||
| -rw-r--r-- | rpkid/tests/sql-dumper.py | 2 | ||||
| -rw-r--r-- | rpkid/tests/yamltest.py | 10 |
4 files changed, 8 insertions, 11 deletions
diff --git a/rpkid/tests/smoketest.py b/rpkid/tests/smoketest.py index 3b4fe7bc..448d93b4 100644 --- a/rpkid/tests/smoketest.py +++ b/rpkid/tests/smoketest.py @@ -7,8 +7,6 @@ Usage: python smoketest.py [ { -c | --config } config_file ] [ { -p | --profile } ] [ { -y | --yaml } yaml_script ] -Default config_file is smoketest.conf, override with --config option. - Default yaml_script is smoketest.yaml, override with -yaml option. yaml_script is a YAML file describing the tests to be run, and is @@ -65,8 +63,7 @@ else: os.environ["TZ"] = "UTC" time.tzset() -cfg_file = "smoketest.conf" - +cfg_file = None yaml_script = None profile = False diff --git a/rpkid/tests/sql-cleaner.py b/rpkid/tests/sql-cleaner.py index 7900ddf9..5c772bc4 100644 --- a/rpkid/tests/sql-cleaner.py +++ b/rpkid/tests/sql-cleaner.py @@ -20,7 +20,7 @@ PERFORMANCE OF THIS SOFTWARE. import subprocess, rpki.config -cfg = rpki.config.parser("yamltest.conf", "yamltest", allow_missing = True) +cfg = rpki.config.parser(None, "yamltest", allow_missing = True) for name in ("rpkid", "irdbd", "pubd"): diff --git a/rpkid/tests/sql-dumper.py b/rpkid/tests/sql-dumper.py index 933b7a2c..503ba98b 100644 --- a/rpkid/tests/sql-dumper.py +++ b/rpkid/tests/sql-dumper.py @@ -20,7 +20,7 @@ PERFORMANCE OF THIS SOFTWARE. import subprocess, rpki.config -cfg = rpki.config.parser("yamltest.conf", "yamltest") +cfg = rpki.config.parser(None, "yamltest") for name in ("rpkid", "irdbd", "pubd"): diff --git a/rpkid/tests/yamltest.py b/rpkid/tests/yamltest.py index 8e140746..ecd00af2 100644 --- a/rpkid/tests/yamltest.py +++ b/rpkid/tests/yamltest.py @@ -425,7 +425,7 @@ class allocation(object): print "Writing", f.name section = None - for line in open(cleanpath(rpkid_dir, "examples/myrpki.conf")): + for line in open(cleanpath(rpkid_dir, "examples/rpki.conf")): m = section_regexp.match(line) if m: section = m.group(1) @@ -486,7 +486,7 @@ class allocation(object): representing the running daemon. """ basename = os.path.basename(prog) - p = subprocess.Popen((sys.executable, prog, "-d", "-c", self.path("myrpki.conf")), + p = subprocess.Popen((sys.executable, prog, "-d", "-c", self.path("rpki.conf")), cwd = self.path(), stdout = open(self.path(os.path.splitext(basename)[0] + ".log"), "w"), stderr = subprocess.STDOUT) @@ -541,7 +541,7 @@ class allocation(object): os.environ["TZ"] = "UTC" time.tzset() -cfg_file = "yamltest.conf" +cfg_file = None pidfile = None keep_going = False @@ -613,7 +613,7 @@ try: d.dump_asns("asns.csv") d.dump_prefixes("prefixes.csv") d.dump_roas("roas.csv") - d.dump_conf("myrpki.conf") + d.dump_conf("rpki.conf") d.dump_rsyncd("rsyncd.conf") if False: d.dump_children("children.csv") @@ -640,7 +640,7 @@ try: "-signkey", "bpki/servers/ca.key", "-in", "bpki/servers/ca.req", "-out", "publication/root.cer", - "-extfile", "myrpki.conf", + "-extfile", "rpki.conf", "-extensions", "rootd_x509_extensions") |