diff options
| author | Rob Austein <sra@hactrn.net> | 2013-03-21 21:49:14 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2013-03-21 21:49:14 +0000 |
| commit | 50d2b46b16c1cb3b32704f23c1028762f6447b04 (patch) | |
| tree | d5502c12ab00e85984011e738f320169752d332e /rpkid/tests | |
| parent | 889305befbbba05381a36f5fc834b651b9f7f083 (diff) | |
[5076] broke yamltest, customize publication_base_directory to fix.
svn path=/trunk/; revision=5196
Diffstat (limited to 'rpkid/tests')
| -rw-r--r-- | rpkid/tests/yamltest.py | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/rpkid/tests/yamltest.py b/rpkid/tests/yamltest.py index 506b68f2..b11fe52d 100644 --- a/rpkid/tests/yamltest.py +++ b/rpkid/tests/yamltest.py @@ -382,25 +382,27 @@ class allocation(object): Write configuration file for OpenSSL and RPKI tools. """ - r = { "handle" : self.name, - "run_rpkid" : str(not self.is_hosted), - "run_pubd" : str(self.runs_pubd), - "run_rootd" : str(self.is_root), - "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(self.pubd.pubd_port), - "publication_rsync_server" : "localhost:%s" % self.pubd.rsync_port, - "bpki_servers_directory" : self.path() } + r = dict( + handle = self.name, + run_rpkid = str(not self.is_hosted), + run_pubd = str(self.runs_pubd), + run_rootd = str(self.is_root), + 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(self.pubd.pubd_port), + publication_rsync_server = "localhost:%s" % self.pubd.rsync_port, + bpki_servers_directory = self.path(), + publication_base_directory = self.path("publication")) r.update(config_overrides) |