diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-07-14 15:57:39 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-07-14 15:57:39 +0200 |
| commit | d215a08db100df10cb4ef2529c5be9c1c990e3e1 (patch) | |
| tree | 2b9a4f67370d21cdb9be2c7c9111c3ed1b3928c6 /setup | |
| parent | 8d7733c057bf530214261716af5762036c54eaf8 (diff) | |
| parent | 86d7f529715f1f68fa44da68369dca8ee4c804b1 (diff) | |
[MERGE] forward port of branch 8.0 up to 86d7f52
Diffstat (limited to 'setup')
| -rwxr-xr-x | setup/package.py | 7 | ||||
| -rwxr-xr-x | setup/win32/static/getfiles.sh | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/setup/package.py b/setup/package.py index e00f8bac3d0..1f7df51c7fa 100755 --- a/setup/package.py +++ b/setup/package.py @@ -123,12 +123,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 = 600 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 @@ -137,7 +137,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 diff --git a/setup/win32/static/getfiles.sh b/setup/win32/static/getfiles.sh index 9d0ebd556ad..5b15c103197 100755 --- a/setup/win32/static/getfiles.sh +++ b/setup/win32/static/getfiles.sh @@ -13,7 +13,7 @@ trap cleanup EXIT wget -q http://get.enterprisedb.com/postgresql/postgresql-9.3.5-1-windows.exe # wkhtmltopdf -wget -q -P $TEMPDIR http://downloads.sourceforge.net/project/wkhtmltopdf/0.12.1/wkhtmltox-0.12.1.2_msvc2013-win32.exe +wget -q -P $TEMPDIR http://download.gna.org/wkhtmltopdf/0.12/0.12.1/wkhtmltox-0.12.1.2_msvc2013-win32.exe 7z x -o$TEMPDIR $TEMPDIR/wkhtmltox-0.12.1.2_msvc2013-win32.exe cp $TEMPDIR/bin/wkhtmltopdf.exe ./wkhtmltopdf |