Commit Graph

4207 Commits

Author SHA1 Message Date
Ch3LL
4b7d6d80c5
Remove unnecessary jinja in curl.sls file 2018-07-20 14:32:14 -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
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
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
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
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
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
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
rallytime
4c691ac57a
Add regression test for Issue #48230
This also tests the fix for issue #38914
2018-07-02 16:56:49 -04: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
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
Ch3LL
2cbcb4fd26
Add user and group to makedirs cmd in file.copy 2018-06-29 10:39:02 -04: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
Daniel A. Wozniak
70c603451b
Fix py2 thin dir issues 2018-06-20 17:16:30 -07: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
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
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
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
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
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
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
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
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
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
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
Frode Gundersen
7c9b0bda33
add win_servermanager.list_available test 2018-05-22 14:43:11 +00: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
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
Daniel A. Wozniak
20b6070d54
Default windows to m1.small for ec2-classic 2018-05-16 14:37:07 -07: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
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 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
502c5bdff5
Ensure mac_service.disabled is correctly querying services 2018-05-09 17:12:50 -04:00
Ch3LL
a020352a03
Catch Sysloghandler errors when log file does not exist 2018-05-08 15:12:35 -04: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
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
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 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
55534fb659
Merge pull request #47311 from Ch3LL/firewall_windows
Add firewall execution modules tests for windows
2018-04-27 09:10:53 -04:00
twangboy
3e6e524eca
Fix some tests`` 2018-04-26 22:37:15 -06:00
Ch3LL
d58be06751
Add additionatl service module integration tests and enable for windows 2018-04-26 18:13:20 -04:00
Nicole Thomas
a545e55543
Merge pull request #47281 from Ch3LL/system_test
Add win_system integration module tests
2018-04-26 12:07:40 -04:00
Nicole Thomas
b64d930df0
Merge pull request #47283 from Ch3LL/ntp_test
Add windows ntp integration module tests
2018-04-26 12:04:43 -04:00
Ch3LL
67beb1451c
Skip netstat test on macosx as its not supported 2018-04-25 16:44:28 -04:00
Ch3LL
4b2fc4ec66
Add windows firewall execution modules integration tests 2018-04-25 15:25:55 -04:00
Ch3LL
ced7f86546
Add windows ntp integration module tests 2018-04-24 15:12:58 -04:00
Ch3LL
c9181a75a6
Add destructivetest decorator on tests 2018-04-24 14:44:15 -04:00
Ch3LL
0d0c8987fc
Add win_system integration module tests 2018-04-24 14:37:14 -04:00
Benedikt Werner
34bf66c09f
Fix pip.installed with pip>=10.0.0 2018-04-21 13:08:08 +02:00
Nicole Thomas
d4269c2b70
Merge pull request #47193 from Ch3LL/network_test
Add network module integration tests
2018-04-20 09:37:18 -04:00
Nicole Thomas
c777248a78
Merge pull request #47189 from Ch3LL/autoruns
Add autoruns.list integration test for Windows
2018-04-19 17:16:33 -04:00
Ch3LL
bbf9987c19
Add network module integration tests 2018-04-19 16:17:35 -04:00
Ch3LL
e9e4d4af70
Add autoruns.list integration test for Windows 2018-04-19 15:09:50 -04:00
Ch3LL
25a84428b8
Add status module integration modules tests for Windows 2018-04-19 12:01:40 -04:00
Nicole Thomas
f5e63584d4
Merge pull request #47134 from Ch3LL/user_win_test
Add user integration tests for windows OS
2018-04-18 10:29:39 -04:00
Ch3LL
e7c9bc4038
Add user integration tests for windows OS 2018-04-17 16:45:41 -04:00
Nicole Thomas
eb5ac51a48
Merge pull request #47102 from gtmanfred/2017.7
dont allow using no_use_wheel for pip 10.0.0 or newer
2018-04-17 16:44:57 -04:00
Daniel Wallace
b71e3d8a04
dont allow using no_use_wheel for pip 10.0.0 or newer
The --no-use-wheel flag has been deprecated in pip 10.0.0
2018-04-17 09:23:02 -05:00
Daniel A. Wozniak
444da3f893
Fix py3 wart (chr vs bytesstring) 2018-04-14 17:39:29 -07:00
Daniel A Wozniak
e8acca01c2
Fix failing state test by normalizing line endings
Fixes:

integration.modules.test_state.StateModuleTest.test_issue_1896_file_append_source
2018-04-14 15:45:11 -07:00
twangboy
6635b9003f
Fix winrm powershell script
Removes the `Hostname` paramater in the winrm create command. It is not
needed. It must match the hostname on the certificate, which is not
defined in the case of the Remote Desktop certificate
Removes extra spaces
2018-04-12 14:41:19 -06:00
Gareth J. Greenaway
9373dff52b
Update test_pkgrepo.py 2018-04-11 10:55:36 -04:00