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
Ch3LL
6032a01f55
change disable check for upstart service on ubuntu14
2018-05-15 12:07:27 -04:00
Daniel A. Wozniak
9e1d1a5ef8
Fix typo
2018-05-14 15:49:36 -04:00
Daniel A. Wozniak
0109249c78
use ignore-undefined-variable
2018-05-14 15:49:20 -04:00
Daniel A. Wozniak
37caecb7f4
Ignore pylint WindowsError
2018-05-14 15:49:15 -04:00
Daniel A. Wozniak
c1135d90c7
Better doc string
2018-05-14 15:49:08 -04:00
Daniel A. Wozniak
e53d6b9ed9
Skip tests when we can not use runas
2018-05-14 15:49:02 -04:00
Ch3LL
225d90ad4c
query the pip path for test test_issue_2087_missing_pip
2018-05-14 15:45:37 -04:00
Nicole Thomas
db0eef3e8b
Merge pull request #47643 from dwoz/runas_detect
...
Remove unwanted file
2018-05-14 13:53:56 -04:00
Daniel A. Wozniak
8c5e54b8b3
Fix typo
2018-05-14 10:30:04 -07:00
Daniel Wozniak
6dd3ab9f06
Merge pull request #47601 from dwoz/runas_detect
...
Skip tests when we can not use runas
2018-05-14 08:26:35 -07:00
Daniel A. Wozniak
3235ac08cb
use ignore-undefined-variable
2018-05-14 08:26:01 -07:00
Daniel Wallace
e0f7cc1447
add proxy tests decorator to pytest conftest
2018-05-13 08:38:38 -04:00
Daniel A. Wozniak
58911d510a
Ignore pylint WindowsError
2018-05-11 01:37:12 -07:00
Nicole Thomas
8a7913ccc3
Merge pull request #47548 from Ch3LL/syslog
...
Catch Sysloghandler errors when log file does not exist
2018-05-10 16:23:24 -04:00
Ch3LL
33b4cfbc5b
Change service assertion check for systemd platforms
2018-05-10 16:16:39 -04:00
Daniel A. Wozniak
17987d3c5a
Better doc string
2018-05-10 12:11:45 -07:00
Daniel A. Wozniak
a48ac26573
Skip tests when we can not use runas
2018-05-10 12:06:56 -07:00
Ch3LL
31f13a4197
sysloghander: check for 3.5.4 python version
2018-05-10 14:12:15 -04:00
Ch3LL
14896f9743
change codeauthor and class name
2018-05-09 17:48:59 -04:00
Ch3LL
502c5bdff5
Ensure mac_service.disabled is correctly querying services
2018-05-09 17:12:50 -04:00
Nicole Thomas
291d3d3bd8
Merge pull request #47540 from terminalmage/cmdmod-home-fix
...
Fix corner case where runas user's HOME env value is incorrect
2018-05-08 16:31:39 -04:00
Ch3LL
a020352a03
Catch Sysloghandler errors when log file does not exist
2018-05-08 15:12:35 -04:00
Mike Place
7cc8d9d30a
Merge pull request #47524 from dwoz/whitelistlines
...
Gracefully handle blank lines in whitelist.txt
2018-05-08 10:04:22 -05:00
Erik Johnson
e4b277f82e
Fix corner case where runas user's HOME env value is incorrect
...
In the test suite, two of the failing `pip.installed` tests were failing
because when we shelled out to get the user's environment, the `HOME`
environment variable's value was incorrectly showing the root user's
home dir.
This change ensures that we use the correct value for the HOME
environment variable when running a command as another user.
2018-05-08 08:42:02 -05:00
Daniel A. Wozniak
4aea7ca571
Update doc string
2018-05-07 14:41:20 -07:00
Daniel A. Wozniak
b3289e5a1c
Fix test file name
2018-05-07 14:40:15 -07:00
Daniel A. Wozniak
2605ff8712
Gracefully handle blank lines in whitelist.txt
2018-05-07 13:35:00 -07:00
Mike Place
068da8ad7d
Merge branch '2017.7' into skip_diskusage
2018-05-07 09:20:38 -05:00
Mike Place
50b9c4d79d
Merge pull request #47478 from terminalmage/rename-pip-state-test
...
Rename pip state test modules to match naming convention
2018-05-07 08:13:12 -05:00
Daniel A Wozniak
c6697b9f16
Move kill process tree and re-use it
2018-05-06 09:44:55 -07:00
Daniel Wozniak
6a4d0380b1
Merge pull request #47493 from dwoz/win_run_timeout
...
Add support for windows timeout to run_salt
2018-05-05 22:34:30 -07:00
Daniel A Wozniak
fec1233dc4
Add support for windows timeout to run_salt
...
The run_salt function needs to support timeout on windows for the full
test suite to run.
2018-05-05 15:10:14 -07:00
Erik Johnson
9f7a9ebebd
Rename pip state test modules to match naming convention
...
This makes the naming match the naming convention used throughout the
test suite and will make the changes in
https://github.com/saltstack/salt/pull/47337 work better.
2018-05-04 15:03:44 -05:00
Daniel Wallace
1f91a85587
specify cache dir for pip install
2018-05-04 12:48:52 -05:00
Nicole Thomas
da9871d36b
Merge pull request #47196 from twangboy/fix_47024
...
Fix issues with pip
2018-05-04 10:23:03 -04:00
twangboy
14ee5537b9
Add @with_tempdir helper
...
Fix two state tests
Remove redundent tests
2018-05-02 12:17:36 -06:00
Mike Place
2f5fc4ecc5
Merge pull request #47399 from isbm/isbm-zeromq17-deprecationwarning-2017.7.2-v2
...
zeromq 17 deprecation warning backport from 2018.3 + tornado 5 fixes
2018-05-02 10:11:15 -05:00
Nicole Thomas
b14e974b5f
Merge pull request #47343 from Ch3LL/win_srv_test
...
Add additional service module integration tests and enable for windows
2018-05-02 09:39:45 -04:00
twangboy
6c3b5fa6fa
Fix typo
2018-05-01 16:28:48 -06:00
Shane Lee
f031710af2
Merge branch '2017.7' into fix_47024
2018-05-01 16:26:04 -06:00
twangboy
7c46d9d0d4
Fix integration.modules.test_pip
...
Pass password as kwarg for runas on Windows
Fix issues with pip 10 in unit.states.test_pip
2018-05-01 15:33:29 -06:00
kstreee@gmail.com
b8d37e0a1e
To add a test case for the syndic environment, copies the test case which was written by @mattp- that was already merged into develop branch, related pr is #46692 .
2018-05-02 03:21:06 +09:00
kstreee
4627bad1fd
Realizes 'tgt' field into actual minions using ckminions to subscribe results of the minions before publishing a payload.
2018-05-02 02:20:56 +09:00
Ch3LL
1a7ffb4e0d
return error if diskusage not available
2018-05-01 13:11:23 -04:00
Ch3LL
2173b6f549
ensure we are enabling/disabling before test
2018-05-01 11:53:55 -04:00
Ch3LL
10bd63a976
Skip status.diskusage integration tests on macsox
2018-04-30 14:44:34 -04:00
Bo Maryniuk
296c589f4b
Use ZMQ switch utility in the integration tests
2018-04-30 16:06:05 +02:00
Daniel A. Wozniak
67745c1362
Older GitPython versions will not have close
2018-04-29 00:50:20 -07:00
Daniel Wozniak
a5367eaf63
Merge pull request #47388 from dwoz/test_pip_fix
...
Fix missing import
2018-04-28 11:33:14 -07:00
Daniel A. Wozniak
eb26321e8b
Fix missing import
2018-04-28 10:29:30 -07:00
Daniel Wallace
9b59b991c2
Merge pull request #47380 from gtmanfred/2017.7
...
add io_loop handling to runtests engine
2018-04-28 12:25:28 -05:00
Daniel Wallace
37822c0cbb
Merge pull request #47384 from dwoz/test_pip_fix
...
Fix py2 version of pip test
2018-04-28 10:13:28 -05:00
Daniel A. Wozniak
a37a9da1fb
Fix py2 version of pip test
2018-04-28 02:24:39 -07:00
Daniel A. Wozniak
1570708fac
Close the repo and fix multiple tests
2018-04-28 01:32:02 -07:00
Daniel Wallace
93d1445ec1
add io_loop handling to runtests engine
2018-04-27 18:51:51 -05:00
twangboy
22ac81df63
Fix integration.modules.test_pip
...
Removes references to `no_chown`. It hasn't been in use since 2015.8
Removes usage of user in pip calls. The user is defined as the current
user which is the default anyway and it's causing tests not to run in
Windows because Windows requires a password
Removes the pwd import since it is no longer needed
2018-04-27 15:15:34 -06:00
Nicole Thomas
31db8ca7ad
Merge pull request #47347 from dwoz/test_mysql_fix_again
...
Proper fix for mysql tests
2018-04-27 13:27:52 -04:00
Daniel A. Wozniak
add78fb618
Fix linter warnings
2018-04-27 09:04:01 -07:00
Erik Johnson
37a13d8004
Update pip unit tests to reflect changes
2018-04-27 09:47:18 -05:00
Erik Johnson
7f86779be0
Lint fix
2018-04-27 09:18:53 -05:00
Nicole Thomas
aacd5cefe3
Merge pull request #47304 from cachedout/test_cli_timeout_arg
...
Pass timeout to salt CLI for tests
2018-04-27 09:11:57 -04:00
Nicole Thomas
55534fb659
Merge pull request #47311 from Ch3LL/firewall_windows
...
Add firewall execution modules tests for windows
2018-04-27 09:10:53 -04:00
Daniel A. Wozniak
2644cc7553
Fix linter nits
2018-04-27 01:22:39 -07:00
Daniel A. Wozniak
799c601184
Proper fix for mysql tests
2018-04-27 00:22:50 -07:00
Daniel A. Wozniak
94a70e847a
Ignore gitfs tests when symlinks not enabled
2018-04-26 23:51:28 -07:00
twangboy
3e6e524eca
Fix some tests``
2018-04-26 22:37:15 -06:00
Daniel Wozniak
dac04261b5
Merge pull request #47342 from dwoz/test_mysql_fix
...
Fix mysql test cases
2018-04-26 17:50:52 -07:00
Daniel A. Wozniak
7496f4c5a8
Fix mysql test cases
2018-04-26 15:42:46 -07:00
Daniel Wozniak
e4779f3246
Merge pull request #47339 from dwoz/ssh_key_test_fix
...
Use salt.utils.fopen for line ending consistancy
2018-04-26 15:39:55 -07:00
Ch3LL
d58be06751
Add additionatl service module integration tests and enable for windows
2018-04-26 18:13:20 -04:00
Daniel A. Wozniak
e37a93a1ca
Remove redundent close call
2018-04-26 13:47:11 -07:00
Daniel A. Wozniak
b2ae5889b7
Close the temporary file handle
2018-04-26 12:52:08 -07:00
