diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-07-14 15:08:14 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-07-14 15:08:14 +0200 |
| commit | be6c7582a0485e734e65f0afd0daf3cbef376540 (patch) | |
| tree | 160359de46e886c79a139ae395f85201ef6fdbda /setup | |
| parent | e12cecea9d33146b863f10f79c8a8319deb8dec5 (diff) | |
[FIX] package.py: search for prompt correctly.
Diffstat (limited to 'setup')
| -rwxr-xr-x | setup/package.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/setup/package.py b/setup/package.py index edfdcab8b94..685e987f7cb 100755 --- a/setup/package.py +++ b/setup/package.py @@ -145,12 +145,12 @@ 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 = '\[root@nightly-tests\] #' + self.prompt_re = '[root@nightly-tests] # ' self.timeout = 1000 def system(self, command): self.docker.sendline(command) - self.docker.expect(self.prompt_re) + self.docker.expect_exact(self.prompt_re) def start(self, docker_image, build_dir, pub_dir): self.build_dir = build_dir @@ -159,7 +159,8 @@ class OdooDocker(object): self.docker = pexpect.spawn( 'docker run -v %s:/opt/release -p 127.0.0.1:%s:8069' ' -t -i %s /bin/bash --noediting' % (self.build_dir, self.port, docker_image), - timeout=self.timeout + timeout=self.timeout, + searchwindowsize=len(self.prompt_re) + 1, ) time.sleep(2) # let the bash start self.docker.logfile_read = self.log_file |
