Nicole Thomas
75942235f0
Merge pull request #41220 from rallytime/bp-40246
...
Back-port #40246 to 2016.11
2017-05-15 11:59:38 -06:00
Mike Place
50d8fde123
Merge pull request #41101 from terminalmage/issue40940
...
Fix "latest" keyword for version specification when used with aggregation
2017-05-15 11:52:35 -05:00
Anthony Shaw
2f610680e5
remove unused imports
2017-05-12 16:38:30 -06:00
Anthony Shaw
9b7de2e7d7
fix unit tests
2017-05-12 16:37:26 -06:00
Anthony Shaw
49d94559ab
linting
2017-05-12 16:36:07 -06:00
Anthony Shaw
4b260a4594
linting
2017-05-12 16:36:07 -06:00
Anthony Shaw
41d1adab5f
fix up tests
2017-05-12 16:36:06 -06:00
Erik Johnson
7fe64219ae
Add rtag check to integration test for pkg.refresh_db
2017-05-12 15:21:22 -05:00
Nicole Thomas
b136b15330
Merge pull request #41104 from Ch3LL/add_jobs_test
...
Add test to query results of /jobs call in api
2017-05-10 14:11:07 -06:00
Ch3LL
dac16583b7
add test to query results of /jobs call in api
2017-05-10 12:39:17 -04:00
lomeroe
2af89f2165
update mock data
2017-05-10 10:33:34 -05:00
lomeroe
b7fa115a59
update win_dns_client tests with correct module names
2017-05-10 10:33:33 -05:00
Mike Place
a2f359fa13
Merge pull request #40852 from isbm/isbm-fix-coregrains-constants-bsc#1032931
...
Isbm fix coregrains constants bsc#1032931
2017-05-09 12:35:45 -06:00
Bo Maryniuk
f3b12a3f5b
Do not use multiple variables in "with" statement as of lint issues
2017-05-09 10:17:49 +02:00
Theophile Meneau
d8766562c9
fix incorrect service.running success response
...
when enable=None and init script returns 0,
but service failed to start.
Fixes #41125
2017-05-08 10:25:21 -04:00
Bo Maryniuk
35a8d99934
Disable the test for a while
2017-05-08 13:49:54 +02:00
Bo Maryniuk
76cb1b7150
Rewrite test case for using no patch decorators
2017-05-08 10:41:50 +02:00
Erik Johnson
ffe4bc3d5c
update unit test to reflect new behavior
2017-05-06 01:29:49 -05:00
Erik Johnson
2af89beb53
Merge pull request #41103 from lorengordon/win.get_route
...
Adds a get_route() function to win_network.py
2017-05-06 01:19:41 -05:00
Erik Johnson
92011dbe5f
Fix "latest" keyword for version specification when used with aggregation
...
The "latest" keyword was only implemented when both "name" and "version"
were used, and not for "pkgs". But mod_aggregate puts all packages into
a single low chunk, within "pkgs". This means that using aggregation in
conjuntion with the "latest" keyword no longer resolves the latest
version and thus breaks these states.
This fixes the problem by moving the logic for resolving the "latest"
keyword into _find_install_targets(). It also makes some improvements to
the logic we use to ensure only one package DB refresh is performed per
Salt run, by making the pkg.refresh_db functions handle removing the
rtag file, instead of requiring a call to a helper function everywhere
in the pkg state where we might be calling a function that refreshes the
package DB.
2017-05-06 00:46:06 -05:00
Loren Gordon
93ce5644ea
Adds test for win_network.get_route
2017-05-05 17:32:50 -04:00
rallytime
da811fe505
Skip the correct test for the matcher tests in Arch
...
I mixed up the test that was actually failing for Arch. I originally
submitted #41074 to skip the test_salt_documentation test in the
shell matcher tests. This is the wrong test to skip.
I reverted the previous commit, and applied the skipTest to the
correct test that is failing on Arch, which is the
test_salt_documentation_arguments_not_assumed test.
2017-05-04 14:45:58 -06:00
rallytime
b9d1ce9aed
Revert "Skip integration.shell.matcher.MatchTest.test_salt_documentation test for Arch"
...
This reverts commit 9eb482d5c7
2017-05-04 14:45:38 -06:00
rallytime
9eb482d5c7
Skip integration.shell.matcher.MatchTest.test_salt_documentation test for Arch
...
This test is failing in Arch due to a bug in salt-testing. Skipping until
salt-testing can be upgraded. For more information, see
https://github.com/saltstack/salt-jenkins/issues/324 .
2017-05-04 11:26:01 -06:00
Mike Place
ff39613a53
Merge pull request #41049 from Ch3LL/fix_wheel_test
...
fix integration wheel test_gen test
2017-05-04 09:33:58 -06:00
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
Ch3LL
ba223827b9
fix integration wheel test_gen test
2017-05-03 15:37:44 -04:00
Bo Maryniuk
f71af0b625
Fix lint issues
2017-04-24 18:46:27 +02:00
Bo Maryniuk
0e6abb3e37
Add UT on set_hw_clock on Gentoo
2017-04-24 16:08:22 +02:00
Bo Maryniuk
a2b1d4638c
Add UT for set_hwclock on Debian
2017-04-24 16:08:22 +02:00
Bo Maryniuk
88e8184702
Add UT set_hwclock on SUSE
2017-04-24 16:08:22 +02:00
Bo Maryniuk
0cd590f927
Fix UT names
2017-04-24 16:08:22 +02:00
Bo Maryniuk
bee94ade63
Add UT for set_hwclock on RedHat
2017-04-24 16:08:22 +02:00
Bo Maryniuk
dfe2610d05
Add UT for set_hwclock on Arch
2017-04-24 16:08:22 +02:00
Bo Maryniuk
d000a8a6f5
Add UT for set_hwclock on solaris
2017-04-24 16:08:22 +02:00
Bo Maryniuk
d2614aedaa
Fix docstrings
2017-04-24 16:08:22 +02:00
Bo Maryniuk
6d782191dc
Add UT for set_hwclock on AIX
2017-04-24 16:08:22 +02:00
Bo Maryniuk
d303e0dd8a
Add UT for AIX on get_hwclock
2017-04-24 16:08:22 +02:00
Bo Maryniuk
86f2d83781
Add UT on Solaris
2017-04-24 16:08:22 +02:00
Bo Maryniuk
c3cafed6d5
Add UT for Debian on get_hwclock
2017-04-24 16:08:22 +02:00
Bo Maryniuk
d337c09357
Add UT for RedHat/SUSE platforms on get_hwclock
2017-04-24 16:08:22 +02:00
Bo Maryniuk
f25dc5c56c
Add UT for get_hwclock on SUSE platform
2017-04-24 16:08:22 +02:00
Bo Maryniuk
08e00c865c
Remove dead code
2017-04-24 16:08:22 +02:00
Bo Maryniuk
1216a0bf12
Add UT for get_hwclock on UTC/localtime
2017-04-24 16:08:22 +02:00
Bo Maryniuk
58676c568d
Add UT for Debian on set_zone
2017-04-24 16:08:22 +02:00
Bo Maryniuk
1b9ce37b1b
Add UT for gentoo on set_zone
2017-04-24 16:08:22 +02:00
Bo Maryniuk
6ed9be985e
Adjust UT to use correct grain for SUSE series
2017-04-24 16:08:22 +02:00
Bo Maryniuk
ce4c836a60
Add UT for set_zone on SUSE series
2017-04-24 16:08:22 +02:00
Bo Maryniuk
155a498b49
Doc fix
2017-04-24 16:08:22 +02:00
Bo Maryniuk
a40876cdac
Remove unnecessary mock patch
2017-04-24 16:08:22 +02:00
