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

Merge pull request #15323 from terminalmage/fix-arch-pkg-test

Browse Source 
Remove reference to nonexistant function in pkg tests
This commit is contained in:
Pedro Algarvio 2014-08-27 20:52:58 +01:00
commit 2efe247764
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/integration/states/pkg.py
View File

@ -236,7 +236,13 @@ class PkgTest(integration.ModuleCase,
# RHEL-based). Don't actually perform this test on other platforms.
if target:
if grains.get('os_family', '') == 'Arch':
self._wait_for_pkgdb_unlock()
for idx in xrange(13):
if idx == 12:
raise Exception('Package database locked after 60 seconds, '
'bailing out')
if not os.path.isfile('/var/lib/pacman/db.lck'):
break
time.sleep(5)
# CentOS 5 has .i386 arch designation for 32-bit pkgs
if os_name == 'CentOS' \