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/smoketest.py | |
| 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/smoketest.py')
| -rw-r--r-- | rpkid/tests/smoketest.py | 6 |
1 files changed, 4 insertions, 2 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() |