saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix Python3 test errors

Browse source
This commit is contained in:
Dheeraj Gupta 2018-02-28 16:25:31 +05:30
parent aa9d709015
commit 08d1ee8baf
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/integration/files/file/base/issue-46127-pip-env-vars.sls
View file

@ -29,7 +29,7 @@ setup_test_virtualenv_1:
issue-46127-setup:
pip.installed:
- name: 'carbon < 1.1'
- name: 'carbon < 1.3'
- no_deps: True
- env_vars:
PYTHONPATH: "/opt/graphite/lib/:/opt/graphite/webapp/"

6
tests/integration/states/test_pip.py
View file

@ -562,7 +562,7 @@ class PipStateTest(ModuleCase, SaltReturnAssertsMixin):
self.assertSaltTrueReturn(ret)
for key in six.iterkeys(ret):
self.assertTrue(ret[key]['result'])
if ret[key]['name'] != 'carbon < 1.1':
if ret[key]['name'] != 'carbon < 1.3':
continue
self.assertEqual(
ret[key]['comment'],
@ -583,11 +583,11 @@ class PipStateTest(ModuleCase, SaltReturnAssertsMixin):
self.assertTrue(ret[key]['result'])
# As we are re-running the formula, some states will not be run
# and "name" may or may not be present, so we use .get() pattern
if ret[key].get('name', '') != 'carbon < 1.1':
if ret[key].get('name', '') != 'carbon < 1.3':
continue
self.assertEqual(
ret[key]['comment'],
('Python package carbon < 1.1 was already installed\n'
('Python package carbon < 1.3 was already installed\n'
'All packages were successfully installed'))
break
else: