Commit Graph

11133 Commits

Author SHA1 Message Date
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