valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
87,111 Commits 24 Branches 182 Tags 341 MiB
c00fd43ee9
Commit Graph

11377 Commits

Author SHA1 Message Date
Nicole Thomas
0bb10107b6
Merge branch '2017.7' into 1045_test_pkg_015_installed_held_centos 2018-08-05 14:12:26 -04:00
Gareth J. Greenaway
24d5e6a22f
Fixing the test_pkg_015_installed_held test to be able to successfully run on CentOS 2018-08-03 21:36:59 -07:00
Gareth J. Greenaway
280d1d2ad2
Fixing failing test, integration.modules.test_service.ServiceModuleTest.test_service_disable_doesnot_exist, on Debian 8 and higher. 2018-08-03 16:39:48 -07:00
Nicole Thomas
905da13653
Merge branch '2017.7' into cmd_win_tests 2018-08-03 15:10:29 -04:00
Nicole Thomas
f8bfab4f9f
Merge pull request #48890 from Ch3LL/cmd_test 
add sleep in test_cmd integration test
 2018-08-02 15:15:07 -04:00
Nicole Thomas
52722f6ded
Merge pull request #48885 from rallytime/flaky-tests-shadow 
Mark shadow module integration test as flaky
 2018-08-02 15:04:34 -04:00
Ch3LL
acda4ed9ab
add sleep in test_cmd integration test 2018-08-02 13:36:33 -04:00
Nicole Thomas
38d9eae537
Merge branch '2017.7' into flaky-tests-matchers 2018-08-02 13:29:57 -04:00
Nicole Thomas
0ca0b6f2f2
Merge pull request #48883 from terminalmage/salt-jenkins-1023 
Fix failing git worktree tests
 2018-08-02 12:51:39 -04:00
rallytime
da871a2d57
Mark shadow module integration test as flaky 
This test fails sometimes, so let's mark it as flaky.

I have tried to reproduce the failure and fix it, but to no avail.

Let's mark it as flaky for now.
 2018-08-02 11:12:35 -04:00
rallytime
3660dff13c
Separate compound matcher tests into individual tests 
When one match fails (and some of these can be flaky) the whole test fails.

This makes it somewhat difficult to track down why the test fails.

I am hoping we won't need the sleeps in this change when the tests are separate,
but let's see how that goes. It worked fine in my testing.

I also updated the test to use pytest notation, rather than unittest.
 2018-08-02 10:42:03 -04:00
Erik Johnson
c61f75cb50
Fix failing git worktree tests 
Git 2.18.0 changed the output format against which some of the asserts
in this test are performed. Instead of displaying the full path to the
worktree, it now references the branch name instead. This test updates
the asserts to look for the basename instead, which should allow it to
pass on Git releases both before and after 2.18.0.
 2018-08-02 09:26:27 -05:00
Nicole Thomas
a84f5155a1
Merge pull request #48869 from Ch3LL/mac_shell_tests 
Catch socket.error exception in testprogram
 2018-08-02 10:19:22 -04:00
Ch3LL
3734b1ec89
Catch socket.error exception in testprogram 2018-08-01 16:35:16 -04:00
rallytime
7320aa9104
Skip unreliable tornado test. 
Even with the flaky decorator, it still fails _sometimes_. This is not
a useful test as it sits. Skipping it for now.
 2018-08-01 15:46:03 -04:00
Ch3LL
9312a993a5
Add cmd module integration tests for windows and fix space in path issue 2018-08-01 14:05:52 -04:00
Nicole Thomas
05f2d65de3
Merge pull request #48853 from rallytime/bp-48850 
Back-port #48850 to 2017.7
 2018-07-31 16:21:48 -04:00
Nicole Thomas
8a1285239a
Merge pull request #48426 from garethgreenaway/46689_fixing_pkg_held_when_package_is_installed 
[2017.7] fixes to states/pkg.py
 2018-07-31 16:18:04 -04:00
rallytime
3c33ee554a
Skip tests in integration.shell.test_master 
Related to https://github.com/saltstack/salt-jenkins/issues/378

This is likely causing all of the flakiness we're seeing on test runs
when the master stops responding.

These tests should be in their own, isolated run, rather than with
the rest of the test suite.
 2018-07-31 15:22:34 -04:00
Daniel Wallace
5b443af7ae
add key-deploy test 2018-07-31 13:36:43 -05:00
Gareth J. Greenaway
11cb86e6eb
General cleanup in pkg state, reducing duplicate code. Fixing the requires_salt_modules decorator, sys.doc was returning too much information for the event to handle. This change specifically calls sys.doc with the module name. 2018-07-31 09:46:05 -07:00
Gareth J. Greenaway
16fb6ae635
Make sure pkg.hold and pkg.unhold are available before running the test. 2018-07-31 09:46:05 -07:00
Gareth J. Greenaway
998651102d
Fixing a situation when a package is already installed via salt or manually and a state attempts to set that package to be held. Previously the holding/unholding logic was only being run against packages that were being installed. This change moves the holding logic outside and runs it against all desired packages. Adding a new test to test holding logic. 2018-07-31 09:46:05 -07:00
Orlando Richards
66936b4f41 Changed string comparison in pip test to match new confirmation string - ref PR #47734. 2018-07-29 21:32:24 +00:00
Nicole Thomas
2e00939a6e
Merge pull request #48788 from Ch3LL/timezone_windows 
Add timzeone windows integration tests and fix get_zone
 2018-07-27 16:14:29 -04:00
Ch3LL
de95a6a215
add unused import to timezone test file 2018-07-27 15:42:35 -04:00
Nicole Thomas
8e61f3dce0
Merge pull request #48742 from frogunder/45014 
add windows integration tests for states.file
 2018-07-27 09:57:26 -04:00
William Giokas
d4ca0e3a97
test: except for OSError only 2018-07-26 17:27:02 -04:00
Ch3LL
f09d1a2c7e
Add timzeon windows integration tests and fix get_zone 2018-07-26 16:44:55 -04:00
Frode Gundersen
f08058b043 Merge branch '45014' of https://github.com/frogunder/salt into 45014 2018-07-26 20:09:17 +00:00
Frode Gundersen
33c20c1ec0
fix tests 2018-07-26 20:04:51 +00:00
Frode Gundersen
757fde70c6
Merge branch '2017.7' into 45014 2018-07-24 11:07:14 -06:00
Frode Gundersen
a7a914060d
add windows integration tests for states.file 2018-07-24 16:42:07 +00:00
Nicole Thomas
ce4e22224e
Merge pull request #48720 from Ch3LL/mac_file_path 
Fix test_managed_source_hash_indifferent_case on macosx to correct tmp path
 2018-07-23 18:32:56 -04:00
Ch3LL
01d25fae19
Fix test_managed_source_hash_indifferent_case on macosx to correct tmp path 2018-07-23 15:02:27 -04:00
Ch3LL
f44a2fc349
Enable service if disabled before running state service tests 2018-07-23 14:05:31 -04:00
rallytime
7332cce567
[2017.7] Mark some tornado tests as flaky 2018-07-23 12:53:26 -04:00
Nicole Thomas
801eae3b8d
Merge pull request #48672 from frogunder/45012 
add service enabled test
 2018-07-23 11:38:48 -04:00
Mike Place
689c231d2b
Merge pull request #48691 from Ch3LL/win_repo_pkg_test 
Add windows pkg module integration tests
 2018-07-22 14:01:29 -06:00
Ch3LL
4b7d6d80c5
Remove unnecessary jinja in curl.sls file 2018-07-20 14:32:14 -04:00
Nicole Thomas
85991680c8
Merge pull request #48345 from twangboy/fix_48169 
Fix behavior of powercfg module and state
 2018-07-20 13:37:12 -04:00
Ch3LL
2bedadfadb
Add windows pkg module integration tests 2018-07-20 12:47:37 -04:00
Nicole Thomas
96447ce541
Merge pull request #48656 from Ch3LL/windows_ip_mod 
Add windows ip module integration tests
 2018-07-20 10:57:44 -04:00
Nicole Thomas
ead19725b6
Merge branch '2017.7' into fix_48169 2018-07-20 10:45:59 -04:00
Nicole Thomas
1ebd96d909
Merge pull request #48664 from Ch3LL/srv_disable_mac 
[2017.7] Fix service.disabled test for macosx
 2018-07-20 10:32:55 -04:00
Nicole Thomas
33812f78f1
Merge pull request #48673 from Ch3LL/mac_port 
Use different pub and ret ports for testprogram integration tests
 2018-07-20 10:11:51 -04:00
Nicole Thomas
5f6a7c4d89
Merge pull request #48675 from Ch3LL/mac_disable 
Fix mac service.disable tests
 2018-07-20 10:09:40 -04:00
Ch3LL
c78efab828
Fix mac service.disable tests 2018-07-19 14:15:58 -04:00
Ch3LL
87dd85a220
Use different pub and ret ports for testprogram integration tests 2018-07-19 13:07:27 -04:00
Frode Gundersen
0747f2e58a
add service enabled test 2018-07-19 16:47:56 +00:00
Ch3LL
f1fbfad387
move the disable call up in try block 2018-07-19 10:32:21 -04:00
Ch3LL
f60d21bda4
reverse assertion order for service disable test 2018-07-19 10:29:18 -04:00
William Yardley
7ff3c9c5ff
Improve handling of npm json output (#43138) 
Rather than look for [ or { at the beginning of a line to identify the json
output, just use salt.utils(.json).findjson.
 2018-07-18 21:42:28 -07:00
Ch3LL
3727d1b3b9
switch try/except to match 2018.3 2018-07-18 18:05:17 -04:00
Ch3LL
fb953c2369
[2017.7] Fix service.disabled test for macosx 2018-07-18 17:58:44 -04:00
Ch3LL
90c3f568b1
Add windows ip module integration tests 2018-07-18 13:58:17 -04:00
Nicole Thomas
5391dd0a8d
Merge pull request #48584 from Ch3LL/mac_user_grp 
Fix grp import for mac in test_user integration test
 2018-07-16 15:28:12 -04:00
Nicole Thomas
61572b6780
Merge pull request #48555 from Ch3LL/ssh_id 
Fix state.sls_id not running on ssh minion
 2018-07-16 09:24:41 -04:00
Ch3LL
585ee9db90
Fix grp import for mac in test_user integration test 2018-07-13 16:25:28 -04:00
Nicole Thomas
aa6dcf39e8
Merge pull request #48583 from Ch3LL/mac_flaky_tests 
Add flaky decorator to mac_system and mac_timezone tests
 2018-07-13 15:56:39 -04:00
Nicole Thomas
6973152057
Merge pull request #48534 from xetix/fix-zypper-latest_version 
Fix behaviour of function latest_version in zypper module when multip…
 2018-07-13 15:56:05 -04:00
Nicole Thomas
9985f0b4c1
Lint: remove extra blank line 2018-07-13 15:55:08 -04:00
Ch3LL
4ba2299a87
import flaky decorator on mac tests 2018-07-13 15:16:06 -04:00
Ch3LL
811220b41e
Add flaky decorator to mac_system and mac_timezone tests 2018-07-13 14:40:26 -04:00
Daniel A Wozniak
136ddf5f54
Finally fix prepend for real 2018-07-13 11:25:27 -07:00
Daniel A Wozniak
66b25e65bf
Fix failing prepend test 
The prepend test is failing when jenkins runs kithchen but is passing in
my test environment. Make sure each test starts without the 'etc' path
existing.
 2018-07-12 19:04:47 -07:00
Patrik
5fbead8a36
Merge branch '2017.7' into fix-zypper-latest_version 2018-07-12 21:05:54 +02:00
xetix
db35d0c1e1 Adding testcase for this fix. 2018-07-12 20:58:16 +02:00
Daniel A Wozniak
c858bf477f
Remove which mock to get the test passing 
This test passes in my local kitchen tests when the which mock is
removed. However, I added this mock to try and get the test passing in
jenkins. The original failure that caused me to add it was removed from
jenkins. This will either fix the test or reveal the other error that
needs to be fixed.
 2018-07-12 11:14:47 -07:00
Ch3LL
f69932f506
fix pylint 2018-07-12 12:37:24 -04:00
Ch3LL
70e36764ee
Add more tests for salt-ssh state.sls_id 2018-07-12 12:16:33 -04:00
Nicole Thomas
ad5a959ab9
Merge pull request #48388 from garethgreenaway/48277_2017_7_file_roots_wrong 
[2017.7] reset file_roots for renderers after compile_pillar
 2018-07-11 09:13:45 -04:00
Daniel Wallace
9ba0f6b3a0
pin pm and grunt packages for npm tests 
Until at least ubuntu 14 is dead.
 2018-07-10 15:03:18 -05:00
Nicole Thomas
16d3daab3c
Merge pull request #48375 from Ch3LL/file_copy 
Add user and group to makedirs cmd in file.copy
 2018-07-10 08:35:10 -04:00
Ch3LL
d16a790775
Add mode to _makedirs call in file.copy 2018-07-09 15:47:37 -04:00
Nicole Thomas
acf42864aa
Merge pull request #48399 from garethgreenaway/48336_2017_7_ensure_chmod_setuid_with_chown 
[2017.7] fixes to module/file.py
 2018-07-06 14:02:29 -04:00
Nicole Thomas
a7e52f0de2
Merge pull request #48429 from rallytime/bp-46824 
Back-port #46824 to 2017.7
 2018-07-03 17:45:36 -04:00
Daniel A. Wozniak
349a2b279e
Prepend test needs file.touch method 2018-07-03 13:32:02 -07:00
Beorn Facchini
8b4486248d
Added ignore_retcode to mock unit tests 2018-07-03 16:05:04 -04:00
Nicole Thomas
422441505d
Merge pull request #48422 from rallytime/fix-48230 
Allow file.managed to work with uppercase source_hash in test=true mode
 2018-07-03 12:40:58 -04:00
Nicole Thomas
83e387c951
Merge pull request #48410 from dwoz/service_dead_test_fix 
Fix service dead test on windows
 2018-07-03 10:17:28 -04:00
rallytime
4c691ac57a
Add regression test for Issue #48230 
This also tests the fix for issue #38914
 2018-07-02 16:56:49 -04:00
Daniel A. Wozniak
5c0923448d
Fix service dead test on windows 2018-07-02 12:03:03 -07:00
Daniel A. Wozniak
9c7085b70f
Fix file state prepend test 2018-07-02 11:30:55 -07:00
Gareth J. Greenaway
6f11da35a7
Fixing a few things in the new test. 2018-07-02 11:20:35 -07:00
Gareth J. Greenaway
cf747b14ec
Fixing lint issue 2018-07-02 11:20:35 -07:00
Gareth J. Greenaway
16d36c79c8
When pillar items are compiled a new render is instantiated but the file_roots is the pillar_roots. This change forces the __opts__['file_roots'] to be set to what is set in actual_file_roots for all renderers once compile_pillar has finished. Adding a test when this situation is run via a orchestration runner. 2018-07-02 11:20:35 -07:00
Daniel Wozniak
10e93bff7f
Merge pull request #48396 from dwoz/symlink_test_fix 
Fix file.symlink state test for windows
 2018-07-02 11:10:31 -07:00
Gareth J. Greenaway
8efd33320f
Normalize the mode before we compare it. 2018-07-02 09:11:42 -07:00
Gareth J. Greenaway
f894f0ecb8
Setting the mode with setuid or setgid bits in addition to setting the owner and group will force the setuid & setgid bits to reset. This change ensures that we set the mode after setting the owner & group. 2018-07-01 12:33:10 -07:00
Daniel A. Wozniak
d3456d31e6
Fix file.symlink state test for windows 2018-06-30 15:44:58 -07:00
twangboy
77629f640a
Fix module unit tests 2018-06-29 11:15:23 -06:00
Ch3LL
2cbcb4fd26
Add user and group to makedirs cmd in file.copy 2018-06-29 10:39:02 -04:00
twangboy
707906ac15
Fix unit.state.test_powercfg 
Add test for test=True
 2018-06-27 16:06:58 -06:00
twangboy
32c5014eb6
Fix unit tests 2018-06-27 16:06:57 -06:00
Nicole Thomas
21ed5b97ce
Merge pull request #48295 from rallytime/bp-48193 
Back-port #48193 to 2017.7
 2018-06-26 19:42:17 -04:00
Nicole Thomas
caf630487c
Merge pull request #48207 from rallytime/bp-48189 
Back-port #48189 to 2017.7
 2018-06-25 15:26:55 -04:00
Thomas Jackson
c0180ff33d
Properly configure syndic in test case 
Without this option we aren't really a syndic and it won't wait
 2018-06-25 10:26:30 -04:00
rallytime
e9d09e0375
Use old is_windows utils path on 2017.7 2018-06-25 10:06:37 -04:00
Nicole Thomas
3327181507
Merge pull request #48234 from dwoz/thin_dir 
Fix py2 thin dir issues
 2018-06-25 09:33:01 -04:00
Nicole Thomas
731ec0a11a
Merge pull request #48037 from terminalmage/fix-custom-types-sync-docs 
Add "sync_mods" argument to state.apply/state.sls
 2018-06-21 15:57:02 -04:00
Erik Johnson
8b1bd0eda2
Update test to reflect changed argument name 2018-06-21 11:39:12 -05:00
Daniel A. Wozniak
70c603451b
Fix py2 thin dir issues 2018-06-20 17:16:30 -07:00
Ch3LL
236773e3e9
Skip new sha256 files on repo.saltstack.com/windows 2018-06-20 14:28:31 -04:00
Daniel Wallace
b965d6c9b3
If pip binary is passed to bin_env, use that pip binary 
We don't need to do a lookup for python to then run `python -m pip`
because we already know where pip is.

Fixes using /bin/pip3

Fixes #48122
 2018-06-19 14:09:11 -04:00
Nicole Thomas
e079fce38d
Merge pull request #48190 from terminalmage/fix-vfstab-test 
Fix mount.vfstab unit test
 2018-06-18 17:47:54 -04:00
Erik Johnson
8d70d14362
Fix mount.vfstab unit test 
This test was calling mount.fstab() instead of mount.vfstab()
 2018-06-18 13:21:40 -05:00
Erik Johnson
9af09e0127
Mock config.get due to changes in _refresh_mine_cache 2018-06-18 00:05:25 -05:00
Erik Johnson
d403ae58d7
Add unit test for docker.update_mine 2018-06-17 21:42:28 -05:00
Nicole Thomas
df2a156338
Merge pull request #48061 from garethgreenaway/port_47049_2017_7 
[2017.7] Porting #47049 to 2017.7.
 2018-06-15 13:15:49 -04:00
Ch3LL
48b5d2e9d3
Add timeout argument to run_salt for ShellCase 2018-06-14 16:19:33 -04:00
Gareth J. Greenaway
7c472fed51
Fixing failing test_set_hwclock_aix test. 2018-06-13 10:15:28 -07:00
Gareth J. Greenaway
ccb0acc958
Porting #47049 to 2017.7. 2018-06-13 10:15:28 -07:00
Erik Johnson
6fe711ad76
Reverse monkeypatching after test_symlink_list finishes 
On Windows, in test_symlink_list we monkeypatch the file_roots. However,
we don't ever reverse that monkeypatching.

This would not have affected other test classes, because the opts we are
monkeypatching are ones created specifically for that test class. And
due to the lexicographic order in which the tests are run,
test_symlink_list is run last. However, if we were to ever add a test to
that test class which would run after test_symlink_list, it would be
affected by the monkeypatching.
 2018-06-13 09:58:29 -05:00
Erik Johnson
cb8e6f9fb8
Remove redundant mocking 
This mocking was added to setup_loader_modules and is no longer needed
in individual tests.
 2018-06-08 12:26:31 -05:00
Erik Johnson
bc3ad795e9
Add test for sync argument to state.sls 2018-06-08 12:22:50 -05:00
Nicole Thomas
871a910fcb
Merge pull request #48009 from dwoz/winswarmfix 
minionswarm runs on windows
 2018-06-08 09:52:35 -04:00
Nicole Thomas
0dcaead36d
Merge pull request #47968 from gtmanfred/2017.7 
Clean up tox + pytest
 2018-06-06 17:23:51 -04:00
Daniel A Wozniak
5027c7bb84
minionswarm runs on windows 2018-06-06 14:19:16 -07:00
Nicole Thomas
42dd6b83eb
Merge pull request #47978 from twangboy/fix_test_pkg 
Add try/finally, fix typo in 7zip def file
 2018-06-06 15:06:03 -04:00
Nicole Thomas
a67b21ef3d
Merge pull request #47959 from twangboy/fix_test_service 
Fix failing test when service doesn't exist
 2018-06-06 15:05:42 -04:00
Daniel Wallace
8d15b93d00
remove tox virtualenvs from doc tests 2018-06-06 12:22:22 -05:00
Gareth J. Greenaway
7b7fb1f5d5
Adding missing test sls file. 2018-06-06 09:00:42 -07:00
Gareth J. Greenaway
54e51bc627
Backporting #47843 to 2017.7, updating test for 2017.7. 2018-06-06 09:00:42 -07:00
Daniel Wallace
556a2067fc
fix masterapi test to use testing directory for configs 2018-06-05 18:36:27 -05:00
Daniel Wallace
5a41f484ef
add EXPENSIVE_TESTS 2018-06-05 18:36:27 -05:00
Daniel Wallace
055cd5a6ba
set DESTRUCTIVE_TESTS environment variable for pytest 2018-06-05 18:36:27 -05:00
twangboy
8bb36b3a4b
Add try/finally, fix typo in 7zip def file 2018-06-05 13:29:49 -06:00
twangboy
0cd47aa81e
Remove unused import 2018-06-04 18:12:16 -06:00
twangboy
d4b42540e3
Fix failing test when service doesn't exist 2018-06-04 18:09:12 -06:00
Nicole Thomas
a2b588299b
Merge pull request #47860 from terminalmage/state-writing-docs 
Clean up doc build warnings, add best practices for writing states
 2018-06-01 10:42:54 -04:00
Daniel Wallace
735e92093e
Merge pull request #47917 from dwoz/winsuite 
Fix windows tests suite breakage
 2018-06-01 06:42:14 -05:00
Daniel A Wozniak
118601ebd6
Fix windows tests suite breakage 2018-05-31 23:17:18 -07:00
Erik Johnson
8cb33d3dec
Quiet the linter 
We need this import to determine whether we have the needed modules to
run the test, even though it is not invoked directly.
 2018-05-31 15:28:25 -05:00
Erik Johnson
91cd57d1e0
Update mocking to reflect changes in service module 2018-05-31 15:28:25 -05:00
Erik Johnson
b9ace5a859
Fix crappy mocking 
This fixes some poorly-conceived mocking that was done because of some
equally dumb imports being done in salt/modules/junos.py (which I fixed
a few commits ago while in the process of cleaning up the docs).
 2018-05-31 15:28:25 -05:00
Erik Johnson
bc9e3acef3
Lint fixes 2018-05-31 15:28:25 -05:00
Erik Johnson
93ee5ee2b0
Fix all Sphinx warnings 
Well, all but one, which we expect to see
 2018-05-31 15:28:25 -05:00
Nicole Thomas
63efb76d51
Merge pull request #47822 from Ch3LL/win_user_test 
Add user state integration tests to windows
 2018-05-30 17:13:06 -04:00
Ch3LL
3a691b405f
add user_home path for both windows and linux 2018-05-30 14:22:10 -04:00
Frode Gundersen
38d114a2d2
add whoami test 2018-05-29 21:51:02 +00:00
Daniel A. Wozniak
c2f8aef7c5
Fix for py3 ec2 cloud tests 2018-05-27 14:09:50 -07:00
Nicole Thomas
0bf651b470
Merge pull request #47846 from Ch3LL/p_refresh_test 
Fix flaky refresh pillar integration test
 2018-05-25 16:50:48 -04:00
Nicole Thomas
799fce979d
Merge pull request #47552 from twangboy/fix_46981 
Show GPO settings, raise error if trying to set gpo managed settings
 2018-05-25 16:41:21 -04:00
Nicole Thomas
ffc2ebc373
Merge pull request #47691 from lomeroe/solaris_product_grains 
Update regexes for Solaris 'product' grain and copy to 'productname' grain
 2018-05-25 16:38:18 -04:00
Nicole Thomas
96b7c0cc76
Merge pull request #47778 from Ch3LL/win_state_pkg 
Add test_pkg integration state tests to windows
 2018-05-25 16:36:46 -04:00
Nicole Thomas
6f934c2259
Merge pull request #47823 from Ch3LL/win_dns_test 
Add win_dns module integration tests for windows
 2018-05-25 16:34:02 -04:00
Ch3LL
019edad8e4
Fix flaky refresh pillar integration test 2018-05-25 15:13:56 -04:00
Nicole Thomas
6889befc6b
Merge branch '2017.7' into solaris_product_grains 2018-05-25 09:57:40 -04:00
Ch3LL
7848114d6a
Add win_dns module integration tests for windows 2018-05-24 14:11:27 -04:00
Nicole Thomas
e1786de6b0
Merge branch '2017.7' into win_state_pkg 2018-05-24 13:36:53 -04:00
Nicole Thomas
cffc9b7806
Merge branch '2017.7' into fix_46981 2018-05-24 12:52:59 -04:00
Nicole Thomas
0ca5224cbf
Merge branch '2017.7' into winuser 2018-05-24 12:08:35 -04:00
Ch3LL
788abf771e
Add user state integration tests to windows 2018-05-24 11:46:02 -04:00
Ch3LL
2509d36888
Add windows to service disable ERROR check in tests 2018-05-24 08:30:17 -04:00
Daniel A. Wozniak
e5948902af
Use salt utils method for this_user 2018-05-24 00:40:20 -07:00
Daniel A. Wozniak
a056a293f1
Centeralize test username lookup 2018-05-23 16:16:35 -07:00
Daniel A Wozniak
6a6ab69722
Get the current username on windows 2018-05-23 16:16:32 -07:00
Nicole Thomas
2cb6634c6b
Merge pull request #47773 from frogunder/45011 
add win_servermanager.list_available test
 2018-05-23 15:44:13 -04:00
Nicole Thomas
e65dece202
Merge pull request #47807 from dwoz/winrmtests 
Try an even bigger timeout
 2018-05-23 15:38:20 -04:00
Daniel A. Wozniak
1f1cc1357a
Increase instance size for cloud tests 2018-05-23 12:35:57 -07:00
Daniel A. Wozniak
be8dcd21f1
Try an even bigger timeout 2018-05-23 11:08:14 -07:00
Nicole Thomas
0e87559ee3
Merge pull request #47781 from rallytime/update-linode-sizes 
Update cloud test profile and docs to use new Linode size lables
 2018-05-23 09:09:12 -04:00
Nicole Thomas
3ddc56cb9b
Merge pull request #47748 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2017.7.6 to 2017.7
 2018-05-22 16:53:01 -04:00
Daniel A. Wozniak
d5eafe9d53
Use common timeout variable 2018-05-22 13:27:26 -07:00
rallytime
a90c1b760e
Update cloud test profile and docs to use new Linode size lables 
Linode changed their size labels recently, so the cloud test profile
and the docs need to be updated accordingly.

The new sizes can be found by running `salt-cloud --list-sizes <my-linode-config>`.

For example, the `Linode 2048` size is now `Linode 2GB`.
 2018-05-22 16:00:39 -04:00
Daniel A. Wozniak
7e948eb540
Increase ec2 cloud timeouts to 1000 2018-05-22 12:23:31 -07:00
Ch3LL
f8c467d3e6
Fix text editor error 2018-05-22 15:19:51 -04:00
Ch3LL
872e162137
Add test_pkg integration state tests to windows 2018-05-22 15:11:14 -04:00
rallytime
17596f3025
Merge branch '2017.7.6' into '2017.7' 
No conflicts.
 2018-05-22 11:26:44 -04:00
Frode Gundersen
7c9b0bda33
add win_servermanager.list_available test 2018-05-22 14:43:11 +00:00
Daniel Wallace
3fdfc0fa82
skip test that breaks test suite 2018-05-21 17:42:35 -05:00
Daniel A. Wozniak
57dd89e6c3
Default to ec2 classic compatible images 2018-05-21 15:01:27 -07:00
Daniel A. Wozniak
f89668920a
Be explicit about winrm setting 2018-05-21 14:29:17 -07:00
Nicole Thomas
f45a96ba1d
Merge pull request #47668 from Ch3LL/win_pkg_test 
Add pkg.latest_version windows test
 2018-05-21 16:26:44 -04:00
Daniel A. Wozniak
63b722ba21
Allow ssh_interface to default to public_ips 2018-05-21 09:30:45 -07:00
Daniel A. Wozniak
e88833a07d
Cloud test fixup 
- Increase winrm timeout
- Ignore winrm tests when dependencies are missing
 2018-05-20 01:24:03 -07:00
Nicole Thomas
00a13761c7
Merge pull request #47682 from terminalmage/issue47182 
Fix traceback when excludes are present in an included SLS file
 2018-05-18 12:47:46 -04:00
Daniel A. Wozniak
6e5cb36839
Default windows to m1.small for ec2-classic 2018-05-18 09:21:33 -04:00
Nicole Thomas
cad062eaa7
Merge pull request #47681 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2017.7.6 to 2017.7
 2018-05-17 17:30:01 -04:00
Nicole Thomas
fd2d45d9c2
Merge pull request #47683 from Ch3LL/mac_user_test 
Remove unnecessary setUp in states.test_user test for mac
 2018-05-17 17:28:25 -04:00
lomeroe
49053bc106 lint fix 2018-05-17 13:56:24 -05:00
lomeroe
6f185c9179 another lint fix 2018-05-17 12:20:49 -05:00
lomeroe
dbffba6876 fix tons of errors in my tests 2018-05-17 10:50:50 -05:00
lomeroe
8c9355d34c Lint fix 2018-05-17 08:34:19 -05:00
Daniel A. Wozniak
20b6070d54
Default windows to m1.small for ec2-classic 2018-05-16 14:37:07 -07:00
lomeroe
b29ec75da7 Update regexes in core grains for detecting the 'product' grain on 
Solaris Sparc systems.  Additionally, copy the 'product' grain to
'productname' to be consistent with other OSes.
 2018-05-16 16:34:07 -05:00
twangboy
008af0ac6b
Fix unit tests 2018-05-16 15:13:41 -06:00
Erik Johnson
d0243e8f23
Suppress spurious lint failure 
This is failing because elsewhere in the test module the get_top()
member function returns None, but this is done in a highstate attribute
which is cleaned up in the tearDown and established as a fresh
salt.state.HighState instance in the setUp.
 2018-05-16 15:13:54 -05:00
Ch3LL
5a1b25b9c7
Remove unnecessary setUp in states.test_user test for mac 2018-05-16 13:54:19 -04:00
Erik Johnson
3b449f11fc
Add regression test for excludes issue 2018-05-16 12:26:46 -05:00
rallytime
6c06cb3ae3
Merge branch '2017.7.6' into '2017.7' 
No conflicts.
 2018-05-16 12:46:26 -04:00
andrei
454291ad62
Fix errors when attempting to cache files with long names or URLs 2018-05-15 22:39:09 -05:00
Daniel Wallace
b0446aab07
Merge pull request #47670 from gtmanfred/2017.7 
add a pytest.ini and update a dependency for kitchen
 2018-05-15 20:56:16 -05:00
Daniel Wallace
dfd5a8715f
add a pytest.ini and update a dependency for kitchen 2018-05-15 20:55:18 -05:00
Daniel Wallace
0d06da6944
Merge pull request #47626 from gtmanfred/2017.7 
Implement Pipfile and remove extra requirements.txt files
 2018-05-15 19:03:11 -05:00
Ch3LL
a8981024de
Add pkg.latest_version windows test 2018-05-15 16:20:55 -04:00
Ch3LL
ba40d3d1a1
Update test_mac_user_enable_auto_login to test both py2 and py3 2018-05-15 14:40:54 -04:00
Nicole Thomas
a07a8906a0
Merge pull request #47578 from Ch3LL/mac_service_disabled 
Ensure mac_service.disabled is correctly querying services
 2018-05-15 14:26:36 -04:00
Nicole Thomas
a4921e86c9
Merge pull request #47645 from Ch3LL/py3_rm_pip 
query the pip path for test test_issue_2087_missing_pip
 2018-05-15 13:16:10 -04:00