summaryrefslogtreecommitdiff
path: root/setup/package.py
diff options
context:
space:
mode:
authorSimon Lejeune <sle@openerp.com>2016-09-25 21:24:53 +0200
committerSimon Lejeune <sle@openerp.com>2016-09-30 12:05:49 +0200
commitc59eb4ffc1da64333075af9d89a620cb9a037cae (patch)
treeb9f39f8222d484ccbf9f7ee2d3616e4a10d63f5b /setup/package.py
parent740a959e05fc28c3a3c9c7c8f9214d934d569306 (diff)
[REF] packaging: renamed configuration files
no fallbacks were implemented to `openerp-server.conf`.
Diffstat (limited to 'setup/package.py')
-rwxr-xr-xsetup/package.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/setup/package.py b/setup/package.py
index 220c655fbec..d5bd0564423 100755
--- a/setup/package.py
+++ b/setup/package.py
@@ -317,8 +317,8 @@ def test_deb(o):
wheezy.system('su postgres -s /bin/bash -c "createdb mycompany"')
wheezy.system('/usr/bin/dpkg -i /opt/release/%s' % wheezy.release)
wheezy.system('/usr/bin/apt-get install -f -y')
- wheezy.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/openerp-server.conf -d mycompany -i base --stop-after-init"')
- wheezy.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/openerp-server.conf -d mycompany &"')
+ wheezy.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/odoo.conf -d mycompany -i base --stop-after-init"')
+ wheezy.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/odoo.conf -d mycompany &"')
def test_rpm(o):
with docker('odoo-%s-fedora-nightly-tests' % version, o.build_dir, o.pub) as fedora24:
@@ -329,8 +329,8 @@ def test_rpm(o):
fedora24.system('su postgres -c "createdb mycompany"')
# Odoo install
fedora24.system('dnf install -d 0 -e 0 /opt/release/%s -y' % fedora24.release)
- fedora24.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/openerp-server.conf -d mycompany -i base --stop-after-init"')
- fedora24.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/openerp-server.conf -d mycompany &"')
+ fedora24.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/odoo.conf -d mycompany -i base --stop-after-init"')
+ fedora24.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/odoo.conf -d mycompany &"')
def test_exe(o):
KVMWinTestExe(o, o.vm_winxp_image, o.vm_winxp_ssh_key, o.vm_winxp_login).start()