Erik Johnson
ee493bae47
Update package targets for Arch pkg tests
...
Something else is installing pytz (likely via pip), causing filesystem
conflicts when the pkg integration tests try to install python2-pytz as
a dep of python2-django.
This commit also changes a bunch of the other tests so that they are
explicitly skipped instead of just being no-ops in cases where they are
not configured to be run. This provides more accurate information in the
overall test results.
2017-05-03 17:02:32 -05:00
rallytime
dd1769ea58
Merge branch '2016.3' into 'carbon'
...
Conflicts:
- salt/modules/file.py
- salt/runners/cloud.py
- salt/utils/gitfs.py
2016-09-14 13:08:42 -06:00
rallytime
9e15df9b23
Switch the order of the decorator
...
When @requires_system_grains is listed before other decorators, wrapper
function gets confused on where the grains kwarg should go.
2016-09-14 12:12:21 -06:00
Mike Place
ee997be6d8
Fix pkg group test by passing a list instead of str
...
Refs integration.states.pkg.PkgTest.test_group_installed_handle_missing_package_group
2016-09-14 09:53:10 -06:00
rallytime
c7d8867096
Gate the pkg.group_installed state test: not all pkg modules have group_install
...
Refs #35907
2016-09-14 09:25:56 -06:00
rallytime
3ed6190ece
Merge branch '2016.3' into 'carbon'
...
Conflicts:
- salt/minion.py
2016-09-09 09:36:57 -06:00
rallytime
d7380d83be
requires_system_grains decorator needs a grains=None kwarg
2016-08-31 11:35:02 -06:00
rallytime
b20f6b9384
Catch CommandExecutionError when group_installed doesn't exist
...
Includes an integration test to make sure this doesn't regress.
Fixes #35819
2016-08-30 11:44:17 -06:00
Justin Anderson
63955392e4
os_family is Suse not SUSE ( #35706 )
2016-08-23 14:55:16 -06:00
Mike Place
d85aca1f7a
Merge branch 'develop' into int_tests_interfaces
2016-07-21 12:26:21 -06:00
twangboy
5bcb27e477
Fix integration tests on windows
2016-07-20 10:00:29 -06:00
Bo Maryniuk
3cb6940904
Bugfix: access 'osmajorrelease' as an integer value
2016-07-18 17:14:57 +02:00
rallytime
49f40e9d99
Merge branch '2016.3' into 'develop'
...
Conflicts:
- doc/conf.py
- doc/topics/reactor/index.rst
- tests/integration/__init__.py
2016-07-12 16:13:56 -06:00
rallytime
815c8b38d5
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-07-08 10:34:32 -06:00
Erik Johnson
4aef44ecdf
Fix pkg.latest integration test for non-LTS ubuntu
...
This test uses ``pkg.list_upgrades`` to find a package which it assumes is
installed, to test ``pkg.installed`` with ``only_upgrade=True``. The
problem with that approach is that ``pkg.list_upgrades`` uses a dry-run
of an ``apt-get dist-upgrade`` to find the upgrades. On non-LTS Ubuntu
releases, a ``dist-upgrade`` results in upgrading to an entirely new
Ubuntu release, and new packages which would be installed by the
dist-upgrade (but are not currently installed) will be included in the
return data. This causes the test to fail when we attempt to run
``pkg.latest`` with ``only_upgrade=True`` on a package which is not
already installed.
This commit fixes the test by ensuring that our target package is
already installed, and continuing to iterate through the return data
from ``pkg.list_upgrades`` until a currently-installed package is found.
2016-07-07 12:51:01 -05:00
rallytime
e4a8c585d0
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/states/pkg.py
2016-07-05 13:11:32 -06:00
rallytime
8398de0baf
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-06-30 16:08:57 -06:00
Erik Johnson
d6af1de0b7
Optimize pkg integration tests and add a couple new tests ( #34377 )
...
* Remove redundant usage of destructiveTest decorator
* Remove unnecessary SLS file
This simple state can be run using run_state
* Explicitly order tests
* Use run_state instead of invoking state.sls
* Ensure only one refresh_db done during pkg integration tests
* Add pkg.latest test for package without an epoch
* Optimize pkg.latest_version usage in pkg integration tests
* Clarify outcome when only_upgrade is used
* Add pkg.latest test with only_upgrade=True
2016-06-30 10:48:22 -04:00
rallytime
cc83fa151a
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/modules/status.py
- salt/utils/__init__.py
- tests/unit/modules/boto_vpc_test.py
- tests/unit/modules/mount_test.py
- tests/unit/states/boto_vpc_test.py
2016-06-28 17:34:27 -06:00
rallytime
f9ab8ba46d
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-06-28 14:26:24 -06:00
Erik Johnson
b793426c23
Remove unnecessarily-disabled sanity check ( #34325 )
...
This was commented out for reasons having nothing to do with anything
else going on in 0c069dd
2016-06-28 11:12:55 -04:00
rallytime
f078d57b57
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/modules/rabbitmq.py
- salt/modules/win_servermanager.py
- salt/state.py
- salt/states/boto_s3_bucket.py
- salt/states/pip_state.py
- salt/states/win_servermanager.py
- tests/unit/modules/win_servermanager_test.py
- tests/unit/states/dockerng_test.py
2016-06-09 13:06:10 -06:00
rallytime
c5b4ec0b0f
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/cli/salt.py
- salt/modules/groupadd.py
- salt/states/service.py
2016-06-08 11:20:18 -06:00
Justin Findlay
0c069ddc95
states.pkg int tests: skip if pkg mgr unavailable
2016-06-06 17:44:43 -06:00
Drew Adams
bcd6a1cd77
fix osfamily from Suse to SUSE
2016-05-26 22:08:40 -07:00
Justin Findlay
d33b365984
states.pkg int tests: add pkgs for MacOS
2016-03-10 10:57:21 -07:00
rallytime
6559ea15b0
Merge branch '2015.5' into '2015.8'
...
Conflicts:
- doc/glossary.rst
- salt/config.py
- tests/unit/modules/gpg_test.py
2016-03-06 10:59:46 -07:00
Erik Johnson
da954d7b92
Add integration test for packages with epoch in version
...
This starts with cent7, but later I can add cent6 as well.
2016-03-03 15:40:22 -06:00
Ch3LL
29a53f4353
rename methods in pkg states test
2016-02-26 06:54:01 +09:00
Ch3LL
a387d175d8
integartion test- ensure decorator only runs on one method and not entire class
2016-02-25 01:55:35 +09:00
Ch3LL
a12e2f566b
fix lint error
2016-02-12 11:38:29 -07:00
Ch3LL
a123efd4ef
added logic to check for installed package
2016-02-12 11:01:35 -07:00
Ch3LL
af82b1233a
integration test for issue #31014
2016-02-10 21:46:22 -07:00
Mike Place
35d6ae2be7
Use with
2015-08-12 12:14:12 -06:00
Pedro Algarvio
f59d669a58
Py3 compatibility fixes
2015-01-30 22:25:04 +00:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
Erik Johnson
ff6a228746
Remove reference to nonexistant function in pkg tests
...
This fixes a ref that was missed in 7984a8c
2014-08-27 13:52:36 -05:00
rallytime
6be33dcdc9
Change install package to help Arch tests pass
2014-08-05 14:35:32 -06:00
C. R. Oldham
253de7a995
PyLint fix.
2014-07-25 12:48:07 -06:00
C. R. Oldham
f53e477735
Merge commit, resolve conflict
2014-07-25 11:16:22 -06:00
C. R. Oldham
c94808689d
Extend dot-in-pkg test to RHEL 5 as well
2014-07-25 10:57:18 -06:00
Thomas S Hatch
288e9bba29
TABS?!?!? Really @cro ??
2014-07-25 10:39:19 -06:00
C. R. Oldham
b6f70ac80f
Make this test check for diff packages on RHEL/Centos 6 vs 7
2014-07-24 19:09:52 -04:00
Erik Johnson
37bf8ee768
Change package used for opensuse integration pkg tests
2014-03-14 11:50:32 -05:00
Erik Johnson
98bcd26139
Fix pkg test with dots in filename
...
The package here is much smaller and should install quicker than the old
one.
2014-02-11 11:22:34 -06:00
Thomas S Hatch
8ce74e0378
disable dot test, need to find another package
2014-02-11 09:41:10 -07:00
Erik Johnson
093065b130
add test for #8614
2013-11-30 22:00:05 -06:00
Pedro Algarvio
d02a2bc224
Include the python encoding file header on tests.
2013-11-27 11:19:24 +00:00
Pedro Algarvio
77101231f2
Install a smaller and with less dependencies package.
2013-11-07 22:09:36 +00:00
Erik Johnson
95efdad8ba
Remove ubuntu 32-bit target
2013-10-20 21:47:05 -05:00
