entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 46 Releases Activity

hobo-deploy: don't call convert-to-sql to create tables (#28263)

This commit is contained in:
Frédéric Péters 2018-11-22 19:59:10 +01:00
parent fd1f7de909
commit 9f7d8aac97
2 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/test_hobo.py
View File

@ -425,14 +425,12 @@ def test_configure_postgresql():
pub.set_config(skip_sql=True)
service['base_url'] = service['base_url'].strip('/')
pub.initialize_sql = mock.Mock()
with mock.patch('psycopg2.connect') as connect:
with mock.patch('subprocess.call') as call:
hobo_cmd.configure_sql(service, pub)
assert connect.call_args_list[0][1] == {'user': 'test', 'database': 'postgres'}
assert connect.call_args_list[1][1] == {'user': 'fred', 'database': 'tests_wcs_wcs_example_net'}
assert call.call_args[0][0][1:] == ['convert-to-sql',
'--dbname', 'tests_wcs_wcs_example_net',
'--user', 'fred', 'wcs.example.net']
hobo_cmd.configure_sql(service, pub)
assert connect.call_args_list[0][1] == {'user': 'test', 'database': 'postgres'}
assert connect.call_args_list[1][1] == {'user': 'fred', 'database': 'tests_wcs_wcs_example_net'}
assert pub.initialize_sql.call_count == 1
pub.reload_cfg()
assert 'createdb-connection-params' in pub.cfg['postgresql']
@ -442,9 +440,9 @@ def test_configure_postgresql():
pub.cfg['postgresql']['database-template-name'] = 'very_long_'*10 + '%s'
with mock.patch('psycopg2.connect') as connect:
with mock.patch('subprocess.call') as call:
hobo_cmd.configure_sql(service, pub)
assert connect.call_args_list[0][1] == {'user': 'test', 'database': 'postgres'}
assert connect.call_args_list[1][1] == {'user': 'fred',
'database': 'very_long_very_long_very_long_c426_ng_very_long_wcs_example_net'}
assert len(connect.call_args_list[1][1]['database']) == 63
hobo_cmd.configure_sql(service, pub)
assert connect.call_args_list[0][1] == {'user': 'test', 'database': 'postgres'}
assert connect.call_args_list[1][1] == {'user': 'fred',
'database': 'very_long_very_long_very_long_c426_ng_very_long_wcs_example_net'}
assert len(connect.call_args_list[1][1]['database']) == 63
assert pub.initialize_sql.call_count == 2

16
wcs/ctl/check_hobos.py
View File

@ -18,7 +18,6 @@ import ConfigParser
import json
import os
import random
import subprocess
import sys
import tempfile
import urllib2
@ -514,19 +513,8 @@ class CmdCheckHobos(Command):
if not new_database:
return
cmd = [sys.argv[0]]
if self.base_options.configfile:
cmd.extend(['-f', self.base_options.configfile])
cmd.append('convert-to-sql')
for param in ('database', 'user', 'password', 'host', 'port'):
if pub.cfg['postgresql'].get(param):
if param == 'database':
cmd.append('--dbname')
else:
cmd.append('--' + param)
cmd.append(str(pub.cfg['postgresql'].get(param)))
cmd.append(str(self.get_instance_path(service)))
subprocess.call(cmd)
# create tables etc.
pub.initialize_sql()
@classmethod
def shared_secret(cls, secret1, secret2):