[MERGE] forward port of branch 7.0 up to be6c758
This commit is contained in:
commit
86d7f52971
|
@ -123,12 +123,12 @@ class OdooDocker(object):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.log_file = NamedTemporaryFile(mode='w+b', prefix="bash", suffix=".txt", delete=False)
|
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.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 = 600
|
self.timeout = 600
|
||||||
|
|
||||||
def system(self, command):
|
def system(self, command):
|
||||||
self.docker.sendline(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):
|
def start(self, docker_image, build_dir, pub_dir):
|
||||||
self.build_dir = build_dir
|
self.build_dir = build_dir
|
||||||
|
@ -137,7 +137,8 @@ class OdooDocker(object):
|
||||||
self.docker = pexpect.spawn(
|
self.docker = pexpect.spawn(
|
||||||
'docker run -v %s:/opt/release -p 127.0.0.1:%s:8069'
|
'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),
|
' -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
|
time.sleep(2) # let the bash start
|
||||||
self.docker.logfile_read = self.log_file
|
self.docker.logfile_read = self.log_file
|
||||||
|
|
Loading…
Reference in New Issue