aboutsummaryrefslogtreecommitdiff
path: root/rpkid/tests
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2012-08-31 16:58:08 +0000
committerRob Austein <sra@hactrn.net>2012-08-31 16:58:08 +0000
commitbcb677739cb95386073038a97ae09397148bcc07 (patch)
tree7760466a584de3ed68107c15e13878ff3512acdd /rpkid/tests
parent568f018e015fe698e6f6fdef95403d59b8602fbe (diff)
Don't whack publication_base_directory when not running in --loopback
mode. svn path=/branches/tk274/; revision=4680
Diffstat (limited to 'rpkid/tests')
-rw-r--r--rpkid/tests/yamlconf.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/rpkid/tests/yamlconf.py b/rpkid/tests/yamlconf.py
index d3fe9f28..e2b6b5b5 100644
--- a/rpkid/tests/yamlconf.py
+++ b/rpkid/tests/yamlconf.py
@@ -357,15 +357,15 @@ class allocation(object):
pubd_sql_username = "pubd",
pubd_server_host = self.pubd.hostname,
pubd_server_port = str(self.pubd.pubd_port),
- publication_rsync_server = self.rsync_server,
- publication_base_directory = self.publication_base_directory)
+ publication_rsync_server = self.rsync_server)
if loopback:
r.update(
irdbd_sql_database = self.irdb_name,
rpkid_sql_database = "rpki%d" % self.engine,
pubd_sql_database = "pubd%d" % self.engine,
- bpki_servers_directory = self.path())
+ bpki_servers_directory = self.path(),
+ publication_base_directory = self.publication_base_directory)
r.update(config_overrides)