summaryrefslogtreecommitdiff
path: root/setup/package.py
diff options
context:
space:
mode:
authorAaron Bohy <aab@odoo.com>2015-01-20 16:46:08 +0100
committerAaron Bohy <aab@odoo.com>2015-01-20 17:39:14 +0100
commit9c8c534c198f3c3b3e7b17d9f1457ddacd974057 (patch)
tree9b8da3d95662cb0e63da9e0ddb3df20fa177d3c2 /setup/package.py
parente40a6fd3252d0f964e2a75862f0c950fa786049b (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-xsetup/package.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup/package.py b/setup/package.py
index 7de6b48fba8..ce0db21bcf9 100755
--- a/setup/package.py
+++ b/setup/package.py
@@ -120,7 +120,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 = 600
def system(self, command):