vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-04-20 19:38:39 +00:00
Code Issues Projects Releases Wiki Activity

Use different keyring in system tests.

Browse Source
This commit is contained in:
Andrey Smirnov
2014-02-12 21:25:55 +04:00
parent 5bf370e18a
commit fb2e1adb5c
8 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
system/lib.py
View File

@@ -129,9 +129,6 @@ class BaseTest(object):
os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "flat.key")])
if hasattr(self, "fixtureCmds"):
if self.fixtureWebServer:
params = {'url': self.webServerUrl}
self.fixtureCmds = [string.Template(cmd).substitute(params) for cmd in self.fixtureCmds]
for cmd in self.fixtureCmds:
self.run_cmd(cmd)
@@ -141,6 +138,12 @@ class BaseTest(object):
def run_cmd(self, command, expected_code=0):
try:
if not hasattr(command, "__iter__"):
params = {'files': os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files")}
if self.fixtureWebServer:
params['url'] = self.webServerUrl
command = string.Template(command).substitute(params)
command = shlex.split(command)
environ = os.environ.copy()
environ["LC_ALL"] = "C"