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

Don't perform version spec pkg tests on FreeBSD

Browse Source 
pkg_add does not support this, so this test will fail when
pkg.latest_version is run and an assertion is done to determine the
targeted version.
This commit is contained in:
Erik Johnson 2013-10-20 15:58:59 -05:00
parent d5120f1041
commit 62a9385ddf
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,6 +74,11 @@ class PkgTest(integration.ModuleCase,
os_family = grains.get('os_family', '') os_family = grains.get('os_family', '')
pkg_targets = _PKG_TARGETS.get(os_family, []) pkg_targets = _PKG_TARGETS.get(os_family, [])
# Don't perform this test on FreeBSD since version specification is not
# supported.
if os_family == 'FreeBSD':
return
# Make sure that we have targets that match the os_family. If this # Make sure that we have targets that match the os_family. If this
# fails then the _PKG_TARGETS dict above needs to have an entry added, # fails then the _PKG_TARGETS dict above needs to have an entry added,
# with two packages that are not installed before these tests are run # with two packages that are not installed before these tests are run
@ -129,6 +134,11 @@ class PkgTest(integration.ModuleCase,
os_family = grains.get('os_family', '') os_family = grains.get('os_family', '')
pkg_targets = _PKG_TARGETS.get(os_family, []) pkg_targets = _PKG_TARGETS.get(os_family, [])
# Don't perform this test on FreeBSD since version specification is not
# supported.
if os_family == 'FreeBSD':
return
# Make sure that we have targets that match the os_family. If this # Make sure that we have targets that match the os_family. If this
# fails then the _PKG_TARGETS dict above needs to have an entry added, # fails then the _PKG_TARGETS dict above needs to have an entry added,
# with two packages that are not installed before these tests are run # with two packages that are not installed before these tests are run