valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pylint fixes

Browse Source
This commit is contained in:
Thomas S Hatch 2013-12-12 20:51:28 -07:00
parent 781bfe2455
commit 39e849c314
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/modules/mysql.py
View File

@ -1088,7 +1088,7 @@ class MysqlModuleUserTest(integration.ModuleCase,
self.assertIn({'Host': '%', 'User': user4_utf8}, ret)
self.assertIn({'Host': 'localhost', 'User': user5_utf8}, ret)
self.assertIn({'Host': '10.0.0.1', 'User': user6_utf8}, ret)
# And finally, test connections on MySQL with theses users
ret = self.run_function(
'mysql.query',

5
tests/unit/modules/mysql_test.py
View File

@ -41,7 +41,7 @@ class MySQLTestCase(TestCase):
Do it before test_user_create_when_user_exists mocks the user_exists call
'''
self._test_call(mysql.user_exists,
{'sql' : ('SELECT User,Host FROM mysql.user WHERE '
{'sql': ('SELECT User,Host FROM mysql.user WHERE '
'User = %(user)s AND Host = %(host)s AND '
'Password = PASSWORD(%(password)s)'),
'sql_args': {'host': 'localhost',
@ -148,7 +148,7 @@ class MySQLTestCase(TestCase):
self._test_call(
mysql.db_exists,
{'sql': 'SHOW DATABASES LIKE %(dbname)s;',
'sql_args': {'dbname': 'test\%\_`\'" db'}
'sql_args': {'dbname': r'test\%\_`\'" db'}
},
'test%_`\'" db'
)
@ -169,7 +169,6 @@ class MySQLTestCase(TestCase):
'''
self._test_call(mysql.user_list, 'SELECT User,Host FROM mysql.user')
def test_user_info(self):
'''
Test to see if the mysql execution module correctly forms the SQL for information on a MySQL user.