x/kolla-mesos
Code Issues Proposed changes

Merge "Change mysql user from test to nobody"

Browse Source
This commit is contained in:
Jenkins
2016-03-17 10:19:18 +00:00
committed by Gerrit Code Review
parent 969ba99e45 de781c6e79
commit 06fc6f32c0
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kolla_mesos/tests/container_scripts/test_start.py
View File

@@ -305,7 +305,7 @@ class GenerateConfigTest(base.BaseTestCase):
afile = {'afile': { afile = {'afile': {
'source': 'config/mariadb/templates/galera.cnf.j2', 'source': 'config/mariadb/templates/galera.cnf.j2',
'dest': '/etc/mysql_dir/my.cnf', 'dest': '/etc/mysql_dir/my.cnf',
'owner': 'mysql', 'owner': 'nobody',
'perm': "0600"}} 'perm': "0600"}}
conf = {'commands': {'setup': { conf = {'commands': {'setup': {
@@ -325,7 +325,7 @@ class GenerateConfigTest(base.BaseTestCase):
afile = {'afile': { afile = {'afile': {
'source': 'config/mariadb/templates/galera.cnf.j2', 'source': 'config/mariadb/templates/galera.cnf.j2',
'dest': '/etc/mysql_dir/my.cnf', 'dest': '/etc/mysql_dir/my.cnf',
'owner': 'mysql', 'owner': 'nobody',
'perm': "0600"}} 'perm': "0600"}}
conf = {'commands': {'setup': { conf = {'commands': {'setup': {
'command': 'true', 'files': afile}}} 'command': 'true', 'files': afile}}}
@@ -346,7 +346,7 @@ class GenerateConfigTest(base.BaseTestCase):
afile = {'afile': { afile = {'afile': {
'source': 'config/mariadb/templates/galera.cnf.j2', 'source': 'config/mariadb/templates/galera.cnf.j2',
'dest': '/etc/mysql_dir/my.cnf', 'dest': '/etc/mysql_dir/my.cnf',
'owner': 'mysql', 'owner': 'nobody',
'perm': "0600"}} 'perm': "0600"}}
conf = {'commands': {'setup': { conf = {'commands': {'setup': {
'command': 'true', 'files': afile}}} 'command': 'true', 'files': afile}}}
@@ -361,7 +361,7 @@ class GenerateConfigTest(base.BaseTestCase):
def test_write_file_no_existing(self, m_call): def test_write_file_no_existing(self, m_call):
conf = {'source': 'config/mariadb/templates/galera.cnf.j2', conf = {'source': 'config/mariadb/templates/galera.cnf.j2',
'dest': '/etc/mysql_dir/my.cnf', 'dest': '/etc/mysql_dir/my.cnf',
'owner': 'mysql', 'owner': 'nobody',
'perm': "0600"} 'perm': "0600"}
self.assertTrue(start.write_file(conf, 'data')) self.assertTrue(start.write_file(conf, 'data'))
m_call.assert_called_once_with(mock.ANY, shell=True) m_call.assert_called_once_with(mock.ANY, shell=True)
@@ -371,7 +371,7 @@ class GenerateConfigTest(base.BaseTestCase):
existing_f = self.create_tempfiles([('existing', 'data1')])[0] existing_f = self.create_tempfiles([('existing', 'data1')])[0]
conf = {'source': 'config/mariadb/templates/galera.cnf.j2', conf = {'source': 'config/mariadb/templates/galera.cnf.j2',
'dest': existing_f, 'dest': existing_f,
'owner': 'mysql', 'owner': 'nobody',
'perm': "0600"} 'perm': "0600"}
self.assertTrue(start.write_file(conf, 'data2')) self.assertTrue(start.write_file(conf, 'data2'))
@@ -383,7 +383,7 @@ class GenerateConfigTest(base.BaseTestCase):
conf = {'source': 'config/mariadb/templates/galera.cnf.j2', conf = {'source': 'config/mariadb/templates/galera.cnf.j2',
'dest': existing_f, 'dest': existing_f,
'owner': 'mysql', 'owner': 'nobody',
'perm': "0600"} 'perm': "0600"}
self.assertFalse(start.write_file(conf, 'data1')) self.assertFalse(start.write_file(conf, 'data1'))
self.assertEqual([], m_call.mock_calls) self.assertEqual([], m_call.mock_calls)