From 4035d55d564764710f573baa4c23a96f711992e1 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 2 Nov 2017 15:52:31 +0100 Subject: [FIX] package: fix the windows build test As the windows package provides odoo from sources alongs with python 3, the test of the build was failing. The odoo-bin.exe was not found because py2exe is not used anymore. Windows firewall is now disabled from package.py to prevent it from blocking local xmlrpc calls. Also, the docker containers were removed when package tests were finished, even when no docker was involved in the process (e.g. only a windows build). This commit fixes the test part of the windows build process. --- setup/package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'setup') diff --git a/setup/package.py b/setup/package.py index 8e6124ae640..eeea18aabe1 100755 --- a/setup/package.py +++ b/setup/package.py @@ -240,8 +240,8 @@ class KVMWinTestExe(KVM): self.rsync('"%s" %s@127.0.0.1:' % (setuppath, self.login)) self.ssh("TEMP=/tmp ./%s /S" % setupfile) self.ssh('PGPASSWORD=openpgpwd /cygdrive/c/"Program Files"/"Odoo %s"/PostgreSQL/bin/createdb.exe -e -U openpg mycompany' % setupversion) - self.ssh('/cygdrive/c/"Program Files"/"Odoo %s"/server/odoo-bin.exe -d mycompany -i base --stop-after-init' % setupversion) - self.ssh('net start %s' % nt_service_name) + self.ssh('netsh advfirewall set publicprofile state off') + self.ssh('/cygdrive/c/"Program Files"/"Odoo {sv}"/python/python.exe \'c:\\Program Files\\Odoo {sv}\\server\\odoo-bin\' -d mycompany -i base --stop-after-init'.format(sv=setupversion)) _rpc_count_modules(port=18069) #---------------------------------------------------------- @@ -524,7 +524,7 @@ def main(): shutil.rmtree(o.build_dir) logging.info('Build dir %s removed' % o.build_dir) - if not o.no_testing: + if not o.no_testing and not (o.no_debian and o.no_rpm and o.no_tarball): system("docker rm -f `docker ps -a | awk '{print $1 }'` 2>>/dev/null") logging.info('Remaining dockers removed') -- cgit v1.2.3