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
93,268 Commits 24 Branches 182 Tags 341 MiB
3e59dda0b1
Commit Graph

4607 Commits

Author SHA1 Message Date
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
185c9e9ae2
only stop service if its running 2018-05-30 15:35:05 -04:00
Ch3LL
e15e674955
Add stderr launchctl helper class and fix service mac tests 2018-05-30 15:30:24 -04:00
Ch3LL
3a691b405f
add user_home path for both windows and linux 2018-05-30 14:22:10 -04:00
Erik Johnson
25afc932f7
WIP salt-jenkins issue 1000 
This adds logging of the output and retcode when the output file fails
to be created. As I have thus far been unable to reproduce this locally,
this is the best shot at seeing what is causing the issue, since
ShellCase's run_script is rather opaque about what happens in the script
itself. We do know from the salt-runtests.log that the `salt-call -g` is
successfully returning, what we don't know is what happened after that
data was returned, and this should provide that insight.
 2018-05-30 11:40:51 -05:00
Frode Gundersen
38d114a2d2
add whoami test 2018-05-29 21:51:02 +00:00
rallytime
120ee16b70
Replace old utils paths with new utils paths 2018-05-29 11:19:34 -04:00
rallytime
dc32b67c03
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/win_snmp.py
  - tests/integration/modules/test_saltutil.py
  - tests/integration/states/test_pkg.py
  - tests/support/helpers.py
  - tests/support/runtests.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/whitelist.txt
 2018-05-29 11:14:39 -04:00
Gareth J. Greenaway
3e074be9c3
Fixing lint 2018-05-28 09:36:46 -07:00
Gareth J. Greenaway
02609b6e61
Adding state files for new test. 2018-05-28 09:36:46 -07:00
Gareth J. Greenaway
377e34c689
Updating function in saltmod to ensure that the result is a failure if the function being run returns as False. 2018-05-28 09:36:45 -07:00
Nicole Thomas
30b31c5db5
Merge pull request #47800 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-25 21:17:40 -04: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
ff6600f25e
Merge branch '2018.3' into fix_47274 2018-05-24 12:47:29 -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
rallytime
c328450be2
Update old utils paths to new paths 2018-05-23 12:35:47 -04:00
rallytime
4abfd26e86
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - requirements/dev_python27.txt
  - requirements/dev_python34.txt
  - salt/fileclient.py
  - salt/output/__init__.py
  - salt/serializers/configparser.py
  - salt/states/pkg.py
  - salt/states/zpool.py
  - salt/transport/tcp.py
  - tests/integration/cloud/providers/test_ec2.py
  - tests/integration/modules/test_mac_user.py
  - tests/integration/modules/test_pip.py
  - tests/integration/modules/test_pkg.py
  - tests/integration/modules/test_service.py
  - tests/integration/states/test_pip_state.py
  - tests/integration/states/test_user.py
  - tests/unit/modules/test_cmdmod.py
 2018-05-23 12:33:00 -04: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
rallytime
1adb8ea27f
Merge branch '2018.3.1' into '2018.3' 
No conflicts.
 2018-05-22 17:14:31 -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
Daniel A. Wozniak
1d9f247fb7
Default windows to m1.small for ec2-classic 2018-05-18 09:20:08 -04:00
Nicole Thomas
b91c0f5647
Merge pull request #47680 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2018.3.1 to 2018.3
 2018-05-17 17:30:27 -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
twangboy
f398cbbdda
Use os.linesep.join instead of textwrap.dedent 2018-05-17 14:51:22 -06:00
Gareth J. Greenaway
0fe32f4066
Updating integration/modules/test_archive to include filenames with unicode characters. 2018-05-17 09:20:38 -06: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
rallytime
9b1773a763
Merge branch '2018.3.1' into '2018.3' 
Conflicts:
  - tests/integration/states/test_pip_state.py
 2018-05-16 12:43:41 -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
fb3bf1ff3e
Merge pull request #47664 from rallytime/bp-47645 
Back-port #47645 to 2018.3.1
 2018-05-15 14:25:27 -04:00
Ch3LL
0a732d8e66
query the pip path for test test_issue_2087_missing_pip 2018-05-15 13:17:54 -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
rallytime
dd3e6f3f0a
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - salt/states/pkgrepo.py
 2018-05-15 12:29:29 -04:00
Ch3LL
6032a01f55
change disable check for upstart service on ubuntu14 2018-05-15 12:07:27 -04:00
Daniel A. Wozniak
7214fe17c8
Fix typo 2018-05-14 15:52:41 -04:00
Daniel A. Wozniak
b6a21dfda3
use ignore-undefined-variable 2018-05-14 15:52:30 -04:00
Daniel A. Wozniak
2429f9fe8a
Ignore pylint WindowsError 2018-05-14 15:52:26 -04:00
Daniel A. Wozniak
2d63682fea
Better doc string 2018-05-14 15:52:22 -04:00
Daniel A. Wozniak
ec2adff699
Skip tests when we can not use runas 2018-05-14 15:52:17 -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
rallytime
295e302fcf
Lint: Fix syntax error from bad merge-conflict resolution 2018-05-10 11:16:02 -04:00
Ch3LL
502c5bdff5
Ensure mac_service.disabled is correctly querying services 2018-05-09 17:12:50 -04:00
rallytime
25f03ae425
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/integration/modules/test_status.py
  - tests/integration/states/test_pip_state.py
  - tests/support/case.py
  - tests/whitelist.txt
 2018-05-09 11:24:02 -04:00
Ch3LL
a020352a03
Catch Sysloghandler errors when log file does not exist 2018-05-08 15:12:35 -04:00
Nicole Thomas
21809ddc02
Merge pull request #47514 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-08 14:36:53 -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
rallytime
e9cb080a00
Cleanup weird spaces 
Some spaces between the `@` and the `skipIf` snuck into the branch
and the linter, nor the tests, caught this for some reason.
 2018-05-07 14:51:39 -04:00
rallytime
5565d5e9b1
Update old utils paths with new utils paths 2018-05-07 13:36:47 -04:00
rallytime
786076ac03
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/windows/modules/get-settings.psm1
  - salt/modules/cmdmod.py
  - salt/modules/pip.py
  - salt/modules/win_lgpo.py
  - salt/states/pip_state.py
  - tests/integration/states/test_pip.py
  - tests/support/helpers.py
  - tests/unit/modules/test_pip.py
  - tests/whitelist.txt
 2018-05-07 13:17:01 -04: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
Daniel Wozniak
8c5b30b541
Merge pull request #47466 from dwoz/randbytes 
bytes file that decodes the same utf-8 and cp1252
 2018-05-04 08:54:23 -07:00
Nicole Thomas
da9871d36b
Merge pull request #47196 from twangboy/fix_47024 
Fix issues with pip
 2018-05-04 10:23:03 -04:00