Merge pull request #22853 from s0undt3ch/2014.7

Don't assume package installation order.
This commit is contained in:
Justin Findlay 2015-04-20 20:42:41 -06:00
commit 03af523de9

View file

@ -181,10 +181,11 @@ class PipModuleTest(integration.ModuleCase):
)
try:
self.assertEqual(ret['retcode'], 0)
self.assertIn(
'Successfully installed pep8 Blinker SaltTesting',
ret['stdout']
)
for package in ('Blinker', 'SaltTesting', 'pep8'):
self.assertRegexpMatches(
ret['stdout'],
r'(?:.*)(Successfully installed)(?:.*)({0})(?:.*)'.format(package)
)
except AssertionError:
import pprint
pprint.pprint(ret)