diff options
| author | Rob Austein <sra@hactrn.net> | 2010-11-14 23:27:49 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2010-11-14 23:27:49 +0000 |
| commit | 5ff190d75abcad8aa6e2d04889c218caf147b352 (patch) | |
| tree | 7a54dc3c8b334e53034c79f2eef181d78107c121 /rpkid/tests | |
| parent | 246c06f0fa9b590c6fcdc95e210a6ec3a0ccfaf2 (diff) | |
Use sys.executable to find Python; use same SQL usernames in yamltest as in smoketest
svn path=/rpkid/tests/smoketest.py; revision=3550
Diffstat (limited to 'rpkid/tests')
| -rw-r--r-- | rpkid/tests/smoketest.py | 6 | ||||
| -rw-r--r-- | rpkid/tests/yamltest.py | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/rpkid/tests/smoketest.py b/rpkid/tests/smoketest.py index 2c461a09..b298142e 100644 --- a/rpkid/tests/smoketest.py +++ b/rpkid/tests/smoketest.py @@ -133,7 +133,7 @@ rsyncd_name = cfg.get("rsyncd_name", "rsyncd") rcynic_name = cfg.get("rcynic_name", "rcynic") pubd_name = cfg.get("pubd_name", "pubd") -prog_python = cfg.get("prog_python", "python") +prog_python = cfg.get("prog_python", sys.executable) prog_rpkid = cfg.get("prog_rpkid", "../../rpkid.py") prog_irdbd = cfg.get("prog_irdbd", "../../irdbd.py") prog_poke = cfg.get("prog_poke", "../../testpoke.py") @@ -333,7 +333,9 @@ def cmd_shell(cb, *cmd): cb() def cmd_echo(cb, *words): - """Echo some text to the log.""" + """ + Echo some text to the log. + """ rpki.log.note(" ".join(words)) cb() diff --git a/rpkid/tests/yamltest.py b/rpkid/tests/yamltest.py index f57e9df8..0eb69834 100644 --- a/rpkid/tests/yamltest.py +++ b/rpkid/tests/yamltest.py @@ -401,13 +401,16 @@ class allocation(object): "run_rootd" : str(self.is_root()), "openssl" : prog_openssl, "irdbd_sql_database" : "irdb%d" % self.engine, + "irdbd_sql_username" : "irdb", "rpkid_sql_database" : "rpki%d" % self.engine, + "rpkid_sql_username" : "rpki", "rpkid_server_host" : "localhost", "rpkid_server_port" : str(self.rpkid_port), "irdbd_server_host" : "localhost", "irdbd_server_port" : str(self.irdbd_port), "rootd_server_port" : str(self.rootd_port), "pubd_sql_database" : "pubd%d" % self.engine, + "pubd_sql_username" : "pubd", "pubd_server_host" : "localhost", "pubd_server_port" : str(s.pubd_port), "publication_rsync_server" : "localhost:%s" % s.rsync_port } @@ -472,7 +475,7 @@ class allocation(object): Run myrpki.py for this entity. """ print 'Running "%s" for %s' % (" ".join(("myrpki",) + args), self.name) - subprocess.check_call(("python", prog_myrpki) + args, cwd = self.path()) + subprocess.check_call((sys.executable, prog_myrpki) + args, cwd = self.path()) def run_python_daemon(self, prog): """ @@ -480,7 +483,7 @@ class allocation(object): representing the running daemon. """ basename = os.path.basename(prog) - p = subprocess.Popen(("python", prog, "-d", "-c", self.path("myrpki.conf")), + p = subprocess.Popen((sys.executable, prog, "-d", "-c", self.path("myrpki.conf")), cwd = self.path(), stdout = open(self.path(os.path.splitext(basename)[0] + ".log"), "w"), stderr = subprocess.STDOUT) |