diff options
| author | Aaron Bohy <aab@odoo.com> | 2015-01-20 16:46:08 +0100 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2015-01-20 17:35:34 +0100 |
| commit | a911265c12f1b42b64cba509e6d5c2b521c06ea7 (patch) | |
| tree | 92780fd7b46a7a84cd1cf1ade6907dbef2e96b0d /setup/package.py | |
| parent | fb4c8220009d167c594acb93816014c48bed6cb2 (diff) | |
[FIX] Packaging: RedHat: prompt overriden in docker
RPM packages did not pass the tests because the centos prompt changed
and thus did not match the regexp anymore. We now explicitely specify
the prompt in our Dockerfiles to prevent such issues.
Diffstat (limited to 'setup/package.py')
| -rwxr-xr-x | setup/package.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/setup/package.py b/setup/package.py index 779a49902ea..c9f60ed81f1 100755 --- a/setup/package.py +++ b/setup/package.py @@ -145,7 +145,7 @@ class OdooDocker(object): def __init__(self): self.log_file = NamedTemporaryFile(mode='w+b', prefix="bash", suffix=".txt", delete=False) self.port = 8069 # TODO sle: reliable way to get a free port? - self.prompt_re = '(\r\nroot@|bash-).*# ' + self.prompt_re = '\[root@nightly-tests\] #' self.timeout = 1000 def system(self, command): |