Commit Graph

4250 Commits

Author SHA1 Message Date
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
Gareth J. Greenaway
13cf9eb5b1
Removing debugging. 2018-04-11 10:55:36 -04:00
Gareth J. Greenaway
a61a8593e5
Removing suse from pkgrepo comments tests. the pkgrepo functions in SUSE pkg module do not support comments. 2018-04-11 10:55:36 -04:00
Nicole Thomas
74d70e95a5
Merge pull request #46999 from gtmanfred/2017.7
switch pip test package
2018-04-10 17:18:32 -04:00
Daniel Wallace
791af8f6ce
switch pip test package
Using irc3-plugins-test, since this should never be updated (i manage it and it
is fulfilling its only job).
2018-04-10 14:09:20 -05:00
Matt Phillips
a9866c7a03 fix parallel mode py3 compatibility
parallel: True codepath incompatibilities uncovered by the added tests.
additionally use salt.serializers.msgpack to avoid other py2/py3/back compat
issues.
2018-04-05 22:30:59 -04:00
Matt Phillips
6d7730864a removing prereq from test orch
seems to be encountering unrelated preexisting failures in the functionality
unrelated to my changes.
2018-04-05 11:45:25 -04:00
Matt Phillips
6c8a25778f add integration test to runners/test_state to exercise parallel
this should hopefully exercise a few different facets of parallel that were
previously not covered in the code base.
2018-04-05 11:45:25 -04:00
Mike Place
7d822f9cec
Merge pull request #46464 from gtmanfred/orchestration
fix salt subset in orchestrator
2018-04-05 09:52:00 -05:00
Daniel A. Wozniak
dc54fc53c3
Fix multiple typos causing tests to fail 2018-04-04 14:20:51 -07:00
Nicole Thomas
f70f6de282
Merge pull request #46647 from twangboy/win_fix_test_grains
Fix the tear down function in integration.modules.test_grains
2018-04-04 17:14:05 -04:00
Daniel Wallace
637cdc6b7b
fix pylint 2018-04-04 14:37:04 -05:00
Daniel Wallace
4a3ed6607d
add test for subset in orchestration 2018-04-03 15:13:00 -05:00
Gareth J. Greenaway
13875e78cf
Fixing documention string for test. 2018-04-03 12:37:49 -07:00
Gareth J. Greenaway
3d288c44d4
Fixing test documentation 2018-04-03 12:37:49 -07:00
Gareth J. Greenaway
6cff02ef6a
Adding tests for #46788 2018-04-03 12:37:49 -07:00
Daniel Wallace
bff61dd291
use http registry for npm
Older versions of npm can't validate the newer certificate.

We don't really need to worry about this, and it would be better to just make
sure the tests run correctly that to use https for the tests.
2018-04-03 09:44:48 -05:00
rallytime
209a8029c3
Fix the new test failures from the mantest changes
The changes in #46778 introduced a couple of test failures into the 2017.7 branch.

This PR cleans up some of the references causing failures on 3 new test failures.
The failures are due to the new reference of the `mantest` module, which is only
used for testing here, and not an actual module in salt to test docs and the
saltutil module against.
2018-04-02 16:06:50 -04:00
Nicole Thomas
3bac9717f4
Merge pull request #46769 from dwoz/wincloudtest
Adding windows minion tests for salt cloud
2018-04-02 14:51:48 -04:00
Mike Place
e533b7182d
Merge pull request #46766 from twangboy/win_fix_test_git
Change the way we're cleaning up after some tests
2018-03-30 12:01:02 -06:00
Daniel A. Wozniak
eabc234e5d
Fix config override name 2018-03-29 13:41:06 -07:00
Erik Johnson
bbfd35d3ea
Replace flaky SPM man test
This replaces a test that has been intermittently failing, and also
expands it to check for _all_ man pages.
2018-03-29 12:19:41 -05:00
Daniel A. Wozniak
810042710d
Set default cloud test timeout back to 500 seconds 2018-03-28 20:39:03 -07:00
Daniel A. Wozniak
5ac89ad307
Use winrm_verify_ssl option causing tests to pass 2018-03-28 20:21:40 -07:00
Daniel A. Wozniak
ba5f11476c
Adding windows minion tests for salt cloud 2018-03-28 15:16:54 -07:00
twangboy
5afc66452c
Remove unused/redundant imports 2018-03-28 12:30:26 -06:00
Nicole Thomas
d3623e0815
Merge pull request #46691 from Ch3LL/win_group_test
Add groupadd module integration tests for Windows
2018-03-28 14:01:45 -04:00
twangboy
88fd72c52c
Use with_tempfile decorator where possible 2018-03-28 11:38:32 -06:00
Nicole Thomas
bd1e8bcc7d
Merge pull request #46734 from terminalmage/busybox
Make busybox image builder work with newer busybox releases
2018-03-27 17:14:28 -04:00
Nicole Thomas
c09c6f819c
Merge pull request #46742 from gtmanfred/2017.7
only use npm test work around on newer versions
2018-03-27 17:13:28 -04:00
Ch3LL
4f1c42c0e3
Workaround getpwnam in auth test for MacOSX 2018-03-27 15:18:29 -04:00
Daniel Wallace
fd0e649d1e
only use npm test work around on newer versions
The workaround only needs to be applied to versions of npm newer than 5.1, but
they work with versions newer than 5.0, so just do all newer versions using the
work around
2018-03-27 13:51:21 -05:00
Erik Johnson
6502b6b4ff
Make busybox image builder work with newer busybox releases 2018-03-27 10:55:52 -05:00
Ch3LL
7cda825e90
Add groupadd module integration tests for Windows 2018-03-23 13:30:22 -04:00
twangboy
c179388b0e
Fix the tear down function in integration.modules.test_grains.GrainsAppendTestCase
Fix the tear down function to just set the grain to an empty list instead of
removing each individual item
2018-03-21 16:37:10 +00:00
Nicole Thomas
83ed40c06a
Merge pull request #46619 from rallytime/merge-2017.7
[2017.7] Merge forward from 2017.7.5 to 2017.7
2018-03-20 15:03:29 -04:00
Nicole Thomas
f038e3c452
Merge pull request #46571 from garethgreenaway/46552_onfail_and_require
[2017.7] fixes to state.py
2018-03-20 09:40:03 -04:00
Nicole Thomas
7bc3c2e588
Merge pull request #46531 from terminalmage/issue44299
Fix regression in yumpkg._parse_repo_file()
2018-03-20 09:34:58 -04:00
rallytime
bcbddf5d07
Merge branch '2017.7.5' into '2017.7'
No conflicts.
2018-03-20 09:10:38 -04:00
Nicole Thomas
cdd768fa4d
Merge pull request #46577 from gtmanfred/2017.7.5
Fix npm issue
2018-03-19 07:51:03 -04:00
Nicole Thomas
e6682c660c
Merge pull request #46551 from terminalmage/salt-jenkins-885
Fix failing pkg integration test on OpenSUSE
2018-03-19 07:50:11 -04:00
Daniel Wallace
78cbf7b5cd
Fix npm issue
Fixes saltstack/salt-jenkins#884
2018-03-16 09:04:09 -06:00
Gareth J. Greenaway
152c43c843
Accounting for a case when multiple onfails are used along with requires. Previously if you have multiple states using 'onfail' and two of those states using a 'require' against the first one state, the last two will run even if the 'onfail' isn't met because the 'require' is met because the first state returns true even though it didn't excute. This change adds an additional hidden variable that is used when checking requisities to determine if the state actually ran. 2018-03-15 17:45:42 -07:00
Daniel Wallace
8d5ab72983
virtualenv version too old for python3.6
This test is testing an old version of virtualenv with pip_env, and the version
of pip is 6.x.x, which is too old and doesn't work with the importlib in python
3.6. Skipping this test if python is newer then 3.5.
2018-03-15 12:18:23 -06:00
Nicole Thomas
98e3260b9a
Merge pull request #46548 from Ch3LL/profit_test
profitbrick test: check for foo,bar username,password set in profitbrick config
2018-03-15 10:25:27 -04:00
Erik Johnson
010d260d06
Rewrite failing Suse pkg integration test
This makes the test less brittle by hard-coding which package to use
2018-03-14 23:35:25 -05:00
Ch3LL
bb338c464c
Fix dimensionsdata test random_name call 2018-03-14 15:28:06 -04:00
Ch3LL
db96c4e72e
check for foo,bar username,password set in profitbrick config 2018-03-14 14:57:48 -04:00
Erik Johnson
ce391c53f4
Add regression test for #44299 2018-03-13 21:30:14 -05:00
Nicole Thomas
22d753364b
Merge pull request #46337 from gtmanfred/2017.7
Fix using names with listen and listen_in
2018-03-12 14:49:59 -04:00
Nicole Thomas
a188984cd9
Merge pull request #46446 from bdrung/fix-typos
Fix various typos
2018-03-08 16:11:46 -05:00
Nicole Thomas
35fe9827fe
Merge pull request #46430 from terminalmage/issue44032
Improve reliability/idempotence of file.blockreplace state
2018-03-08 10:41:37 -05:00
Benjamin Drung
a3c54b50f6 Fix various spelling mistakes
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2018-03-08 15:25:42 +01:00
Erik Johnson
f9f187e915
Improve reliability/idempotence of file.blockreplace state
This makes the following changes:

- The `append_newline` argument to the `file.blockreplace`
  remote-execution function has been modified so that if its value is
  `None`, it only appends a newline when the content block does not end
  in one.
- A couple of fixes were made to newline handling. The existing code
  normalized the newlines in the content block, replacing them with
  os.linesep. However, when the file contains newlines that don't match
  the OS (i.e. POSIX newlines in a file on a Windows box, or Windows
  newlines on a Linux/Mac/BSD/etc. box), then we would still end up with
  mixed newlines. The line separator is now detected when we read in the
  original file, and the detected line separator is used when writing
  the content block. Additionally, the same newline mismatch was
  possible when appending/prepending the content block. This has been
  fixed by using a common function for appending, prepending, and
  replacing the content block.
- Support for the `append_newline` argument has been added to the
  `file.blockreplace` state. The default value for the state is `None`.
  A `versionchanged` has been added to the remote execution function to
  let users know that the Fluorine release will change the default value
  of that variable.
- 20 new integration tests have been written to test the
  `file.blockreplace` state.
2018-03-07 22:29:39 -06:00
Daniel Wallace
3620611b5b
fix unhold package for debian 2018-03-06 14:54:40 -07:00
Daniel Wallace
d6d9e36359
add tests for names and listen/listen_in
Closes #30115
2018-03-05 12:15:23 -07:00
Nicole Thomas
88b5f7383d
Merge pull request #46242 from redbaron4/fix-46127
Pass env_vars to pip.freeze
2018-03-05 09:53:12 -05:00
Nicole Thomas
a0716643e4
Merge pull request #46265 from Ch3LL/profit_cloud
Add username/password to profitbricks conf for cloud tests
2018-03-02 16:40:21 -05:00
Ch3LL
d4893eab4c
Add username/password to profitbricks conf for cloud tests 2018-02-28 17:09:28 -05:00
Dheeraj Gupta
08d1ee8baf Fix Python3 test errors 2018-02-28 16:44:29 +05:30
Dheeraj Gupta
aa9d709015 Pass env_vars to pip.freeze
pip.installed state calls pip.freeze to check for existing installation
and to verify installation post-install. This patch propagates the
env_vars passed to pip.installed to the pip.freeze function. It also modifies
existing pip unit tests to test new functionality and adds an integration test
that verifies the expected correct behavior

Fixes #46127
2018-02-28 16:44:20 +05:30
Erik Johnson
31b1d98fcb
Replace direct use of os.umask with use of existing context manager
In cases where os.umask was being used simply to get the umask, a new
helper function has been added to keep improper direct usage of os.umask
from permanenly modifying the umask.
2018-02-27 23:42:51 -06:00
Erik Johnson
0eb012659c
Fix hanging tests in integration suite
A recent change to nginx appears to be causing this test to fail to
cache the test file in the temp nginx instance we've spun up. This
causes the return of cp.cache_file to be False, which in and of itself
should be enough to fail the test. But since we're not asserting on the
cp.cache_file results, flow proceeds to the next block of code, in which
we open the "file" that we cached. Some genius thought it would be a
swell idea to make io.open() successfully open a filehandle when the
path passed to it is a boolean False. When you try to read from this
filehandle, an AMAZING thing happens... It just blocks. Forever. I know,
right? Pure genius.

This commit adds an assert so that the test fails gracefully and doesn't
try to read from a bogus filehandle that SHOULDN'T EVEN EXIST.
2018-02-27 13:32:57 -06:00
Nicole Thomas
cf367dbd04
Merge pull request #45942 from terminalmage/issue45679-2017.7
Fix incorrect translation of docker port_bindings -> ports (2017.7 branch)
2018-02-13 11:10:02 -05:00
Nicole Thomas
007214f7bf
Merge pull request #45908 from DimensionDataResearch/fix/issue/45884
Fix for #45884 ("TypeError: can't serialize <NodeImage" when calling salt-cloud with the dimensiondata driver)
2018-02-12 17:05:28 -05:00
Erik Johnson
9cd47b39dd
Fix incorrect translation of docker port_bindings -> ports
The logic which ensures that we expose ports which are being bound,
even when not explicitly configured, was done incorrectly. UDP ports
were being passed to the API as '1234/udp' instead of (1234, 'udp').
This results in the port not being exposed properly.

The logic has been corrected. Additionally both the "ports" input
translation function, as well as the post-processing code (where the
port numbers configured in port_bindings were being added) both
contained code to "fix" any ports which were configured using
'portnum/tcp', as these must be passed to the API simply as integers. To
reduce code duplication, this normalization is now only performed at the
very end of the post-processing function, after ports have been
translated, and any missing ports from the port_bindings have been
added.

The unit test for the port_bindings input translation code, which was
written based upon the same incorrect reading of the API docs that
resulted in the incorrect behavior, have been updated to confirm the
(now) correct behavior. The unit test for the ports input translation
code has been updated to reflect the new normalization behavior.

Finally, an integration test has been added to ensure that we properly
expose UDP ports which are added as part of the post-processing
function.
2018-02-08 23:23:43 -06:00
Adam Friedman
1a75786b5a
Fix linter warnings.
saltstack/salt#45884
2018-02-09 05:16:59 +11:00
Adam Friedman
a2bc155c73
Use __utils__['cloud.'] instead of salt.cloud.utils.
saltstack/salt#45884
2018-02-08 08:39:33 +11:00
Adam Friedman
de26b03e2c
Fix copy/paste bug in dimensiondata provider integration test.
saltstack/salt#45884
2018-02-08 08:39:07 +11:00
Adam Friedman
6b1b6be427
Add integration tests for dimensiondata cloud provider.
saltstack/salt#45884
2018-02-08 08:38:58 +11:00
Erik Johnson
9d200efc26
Add regression test for issue 45893 2018-02-07 14:32:59 -06:00
Gareth J. Greenaway
359265869f
Adding a couple tests to ensure that duration is included in state run results even when states do not run. 2018-01-26 12:06:29 -08:00
rallytime
9f78e53d4b
Merge branch '2017.7.3' into '2017.7'
No conflicts.
2018-01-24 16:09:17 -05:00
Erik Johnson
4a6ab729dd
Fix failing pkg integration tests for releases with no '.'
Fedora releases are integers, and Arch's osrelease is simply `rolling`,
so https://github.com/saltstack/salt/pull/45636 caused these tests to
regress. This fixes them by moving the osrelease check until after the
MacOS check.

It also fixes the windows check, which would _always_ evaluate to `True`
since it was not calling the function. Therefore, the `if` would just be
a simple boolean which would resolve to `True` since it was just checking
a function reference.
2018-01-24 10:13:22 -06:00
Nicole Thomas
7934372b7b
Merge pull request #45649 from rallytime/bp-45634
Back-port #45634 to 2017.7.3
2018-01-24 09:59:42 -05:00
Nicole Thomas
e5c9cd91e8
Merge pull request #45619 from garethgreenaway/2017_7_test_mac_user_enable_auto_login
[2017.7] Fixing test_mac_user_enable_auto_login
2018-01-23 16:56:03 -05:00
Ch3LL
1c78fc23ea
Add different service name for Mac 10.13 test 2018-01-23 16:53:06 -05:00
Nicole Thomas
c290b6320b
Merge pull request #45634 from Ch3LL/mac-service
Add different service name for Mac 10.13 test
2018-01-23 16:51:56 -05:00
Nicole Thomas
0931b6417d
Merge pull request #45636 from Ch3LL/mac-tests
Fix mac service and pkg tests for 10.13
2018-01-23 13:44:55 -05:00
Ch3LL
df0ad54c9a
remove unnecessary variable for test 2018-01-23 11:47:32 -05:00
Ch3LL
acb14fd43d
fix pylint 2018-01-23 11:42:49 -05:00
Ch3LL
a9b12cd1ea
Fix mac service and pkg tests for 10.13 2018-01-23 11:39:06 -05:00
Ch3LL
31b712e27d
Add different service name for Mac 10.13 test 2018-01-23 10:07:10 -05:00
Gareth J. Greenaway
f5f03e1e6c
Fixing integration.modules.test_mac_user.MacUserModuleTest.test_mac_user_disable_auto_login 2018-01-22 14:10:23 -08:00
rallytime
a5fc3b3363
Merge branch '2017.7.3' into '2017.7'
No conflicts.
2018-01-22 11:55:54 -05:00
Erik Johnson
629e6c9674
Further fixes to for salt-ssh test under heavy load
This makes some further tweaks to make the test more stable under heavy
load. Firstly, the background job sleeps longer, and secondly, we make
up to 3 attempts run state.running instead of just the one, in case our
first attempt was too early. It also uses threading to make the job
sleep, since the method of adding a & to the command seemed to be
producing intermittent failures with returning clean JSON.
2018-01-22 07:33:42 -05:00
Daniel Wallace
f7fd35fc4a
test updating the minion blackout timeout to 10 seconds 2018-01-21 14:42:56 -07:00
Daniel Wallace
1f71f301ba
specify checking man page path
Without setting the man path, this would be checking that the installed salt
package used to bootstap has an spm man page, which is possible that it
doesn't, and also not what we want to check
2018-01-19 17:53:20 -07:00
Daniel Wallace
0ba39a7108
switch systemd-journald for sshd for arch service test
the running tests run second because of alphabetical order, and stopping sshd
does not kill off the running connection, so we know that sshd has to be on
arch for us to connect, so stop it with dead and start it back with running.

It is also not possible to stop the systemd-journald process without shutting
down the full machine.
2018-01-19 15:17:53 -07:00
rallytime
e0ffa32b49
Merge branch '2016.11' into '2017.7'
Conflicts:
  - tests/integration/modules/test_pkg.py
2018-01-19 10:09:36 -05:00
Daniel Wallace
f4b6367cf9
fix fedora pkg test
yum is no longer installed by default on fedora.  apparently it has been
removed from the base installs, and only dnf is available.  Stop depending on
the pkg manager, and just use bash.
2018-01-18 14:54:54 -07:00
Daniel Wallace
5455d2dee6
fix centos 6 pip test
flake8 is having problems installing on python2.6, switching to different
module that still works easily on python 2.6
2018-01-17 22:41:06 -07:00
Daniel Wallace
40255194b0
fix fedora pkg test
yum is no longer installed by default on fedora.  apparently it has been
removed from the base installs, and only dnf is available.  Stop depending on
the pkg manager, and just use bash.
2018-01-17 21:35:41 -07:00
rallytime
de6d85959a
Lint fix 2018-01-17 12:42:38 -05:00
rallytime
9f547a31f0
Merge branch '2016.11' into '2017.7' 2018-01-16 17:19:08 -05:00
Nicole Thomas
5f58a87e84
Merge pull request #45365 from meaksh/2017.7-issue-45345
Return an error when "gid_from_name" is set but group does not exist
2018-01-16 13:31:49 -05:00
Nicole Thomas
de080983e3
Merge pull request #44822 from frogunder/pkg_latestversion
add pkg_latest_version test
2018-01-16 09:16:53 -05:00
rallytime
590a6db626
Lint: use support TMP path instead of integration TMP path 2018-01-16 09:13:27 -05:00
Erik Johnson
919e92c911
Fix git.latest failure when rev is not the default branch 2018-01-14 08:25:30 -05:00
Erik Johnson
c081b2c62c
Fix git.latest failure when rev is not the default branch 2018-01-14 08:23:38 -05:00
Pablo Suárez Hernández
52f9c06908
Fix integration tests for 'user.present' state. 2018-01-12 12:47:29 +00:00
Erik Johnson
0cbc6767bf
Fix git.latest failure when rev is not the default branch 2018-01-11 15:26:35 -06:00
twangboy
0356b3d56f
Backport changes from #45308 2018-01-11 15:36:38 -05:00
Nicole Thomas
2340f0b487
Merge pull request #45380 from twangboy/backport_45308
Backport changes from #45308
2018-01-11 14:45:20 -05:00
Frode Gundersen
08644e02a0
skip if mac 2018-01-11 19:12:31 +00:00
Nicole Thomas
22c3efda06
Merge pull request #45371 from rallytime/bp-45158
Back-port #45158 to 2017.7
2018-01-11 12:51:37 -05:00
Erik Johnson
ff3039db6c
Skip flaky test on 2017.7 branch
The behavior of the set union used to combine ext_nodes and top file
matches is not consistent on Python 3 (well, 3.5 at least), and this
produces flaky test results.

Since we do not change things like the state compiler in point
releases, the method used to combine the ext_nodes and top file matches
has been changed for Oxygen and is now fully deterministic. This test
will therefore be skipped for the remainder of the 2017.7 release cycle
on Python 3.

Fixes https://github.com/saltstack/salt-jenkins/issues/686.
2018-01-10 16:02:32 -06:00
twangboy
419be8a9b5
Backport changes from #45308 2018-01-10 11:16:59 -07:00
Erik Johnson
3565bc2bf2
Don't use include-test SLS in orch tests
This was the _actual_ cause of the failing test in the state module
integration tests.
2018-01-10 10:29:15 -05:00
Erik Johnson
8bc17e0d7a
Fix integration.modules.test_state.StateModuleTest.test_exclude
test_exclude shares file paths with test_include, and while I can't
reproduce the failures, it is likely that improperly cleaned-up files
from test_include are causing the failures in test_exclude. This is
backed up by the fact that the state.sls return data from the
salt-runtests.log shows no trace of the "to-include-test" file
(suggesting it was excluded as expected), yet os.path.isfile() returns
True for this path, causing the test to fail.

This commit uses a distinct base dir for both tests, which should keep
this sort of failure from happening.
2018-01-10 10:29:15 -05:00
Nicole Thomas
fb87010461
Merge pull request #45297 from Ch3LL/mac_service_state
Allow macosx service state tests to check for pid return
2018-01-09 15:47:23 -05:00
Nicole Thomas
8d04c2b3d4
Merge pull request #44856 from Ch3LL/running_test
Add state.running ssh integration test
2018-01-08 16:40:49 -05:00
Ch3LL
9a35a73711
add time limit to while loop 2018-01-05 16:18:31 -05:00
Ch3LL
4e569b5802
Allow macosx service state tests to check for pid return 2018-01-05 12:25:44 -05:00
Daniel Wallace
cf98ed472e
fix up symlinks 2018-01-04 17:29:45 -05:00
Nicole Thomas
2934b60d53
Merge pull request #45254 from Ch3LL/fix_mac_grain_ssh
Add darwin value for ssh grain items tests on MacOSX
2018-01-04 16:31:34 -05:00
Nicole Thomas
d0a3770035
Merge pull request #44930 from frogunder/man_spm
man_spm_test
2018-01-04 15:58:01 -05:00
Ch3LL
b4b59b89cd
remove platform from salt.utils call for 2017.7 2018-01-04 14:42:30 -05:00
Ch3LL
74e6ed60ea
Fix MacOSX Service Status Check and integration test 2018-01-03 17:19:51 -05:00
Ch3LL
85e853a63d
Add darwin value for ssh grain items tests on MacOSX 2018-01-03 13:58:28 -05:00
rallytime
a3d251b2cd
Merge branch '2016.11' into '2017.7' 2018-01-02 15:21:58 -05:00
Daniel Wallace
2d0a9bbf7e
enable UsePAM for ssh tests 2018-01-02 12:29:43 -05:00
rallytime
a26d4795bd
[2017.7] Fix docstring integration test failure 2017-12-28 10:59:16 -05:00
Gareth J. Greenaway
48eafe3206
Adding some tests to tests cmd.script with cwd 2017-12-21 15:53:38 -08:00
Nicole Thomas
b49ee97938
Merge pull request #45124 from gtmanfred/2017.7
enable using kitchen-salt with ec2 on 2017.7
2017-12-21 14:11:27 -05:00
Daniel Wallace
23bd38ad66
enable using kitchen-salt on ec2
These changes are needed to run the test suite on ec2 using sudo.
2017-12-20 17:18:39 -07:00
Nicole Thomas
42e894570d
Merge pull request #45087 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-12-20 17:24:50 -05:00
Ch3LL
1bd7110a14
Fix spm big file build test to check /tmp 2017-12-20 14:40:10 -05:00
rallytime
fe81e2d39a
Merge branch '2016.11' into '2017.7'
No conflicts.
2017-12-20 10:26:10 -05:00
Erik Johnson
80b6bd6813
Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install
Carbon 1.1.1 for some reason added six to their setup.py, which breaks
this test since it's not installed into the virtualenv. This PR forces
this test to use a version of carbon which does not dep on six in its
setup.py.
2017-12-20 06:54:30 -05:00
Frode Gundersen
dfb68f32d2
fix if statements and string 2017-12-19 19:45:19 +00:00
Nicole Thomas
e0d7b330fa
Merge pull request #44650 from frogunder/status
add status.pid test
2017-12-19 11:21:08 -05:00
Frode Gundersen
48e6953e1f
fix_string_error 2017-12-14 22:40:59 +00:00
Frode Gundersen
c9fa4ed2a7
man_spm_test 2017-12-11 19:52:32 +00:00
Nicole Thomas
54d29a61cb
Merge pull request #44787 from rallytime/groupadd-destructive-clean
GroupAdd test: Add destructive test decorator to entire class
2017-12-11 13:14:17 -05:00
rallytime
23c5a4ca3e
Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/file.py
  - tests/integration/states/test_file.py
  - tests/unit/states/test_file.py
2017-12-07 17:33:03 -05:00
Gareth J. Greenaway
edcd581ca5
Merge branch '2017.7' into win_fix_file.managed 2017-12-07 10:00:55 -08:00
Nicole Thomas
74ee7ce541
Merge pull request #44748 from twangboy/osx_fix_auto_login
Fix auto login support for OSX
2017-12-07 09:22:22 -05:00
Ch3LL
aeb5f4e248
Add state.running ssh integration test 2017-12-06 13:23:55 -05:00
Nicole Thomas
904c0da893
Merge branch '2017.7' into status 2017-12-06 12:51:52 -05:00
Nicole Thomas
019169ed61
Merge pull request #44824 from Ch3LL/spm_args
Add spm -y and -f arg integration tests
2017-12-05 16:49:31 -05:00
Ch3LL
d8f81d2e4d
fix pylint 2017-12-05 14:39:36 -05:00
Nicole Thomas
59b930668c
Merge pull request #44742 from Ch3LL/cloud_action_test
Add salt-cloud action rename integration test
2017-12-05 12:44:49 -05:00
Ch3LL
951d09ca2f
remove unnecessary try/except block 2017-12-04 16:18:01 -05:00
Ch3LL
c329ced7ee
Add salt-cloud action rename integration test 2017-12-04 16:16:08 -05:00
Ch3LL
61ac5cf157
Add spm -y and -f arg integration tests 2017-12-04 16:06:14 -05:00
twangboy
a27bb6993a
Fix py3 error 2017-12-04 14:05:54 -07:00
twangboy
187bc1e61e
Add back the try/finally blocks 2017-12-04 14:05:54 -07:00
twangboy
d7241d004f
Fix 2 more tests 2017-12-04 14:05:54 -07:00
twangboy
d5dd42aebe
Fix integration tests for Windows 2017-12-04 14:05:53 -07:00
twangboy
af5565859e
Use file functions for symlink and remove 2017-12-04 14:05:53 -07:00
twangboy
068e463870
Fix lint, add integration tests 2017-12-04 13:29:37 -07:00
Frode Gundersen
3504083849
add pkg_latest_version test 2017-12-04 20:28:52 +00:00
Erik Johnson
153bf45b03
Fix regression in file.managed when source_hash used with local file
This ensures that we enforce the passed source_hash when the source is a
file local to the minion.
2017-12-03 00:01:44 -06:00
rallytime
3d9eafc4bd
Lint: Remove extra empty lines at end of files 2017-12-01 14:46:27 -05:00
rallytime
817ac002b0
Add destructive test decorator to test class
Because the destructive test decorator was applied to the tearDown
function, the tests show a stacktrace instead of a nice skip message
when running without the `--run-destructive` flag. By applying the
decorator to the test class (since all tests are destructive anyway)
we can keep the output clean and still skip tests appropriately.
2017-12-01 14:33:38 -05:00
rallytime
239f3511bf
Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/modules/reg.py
  - salt/modules/state.py
  - salt/modules/win_pkg.py
  - salt/netapi/rest_cherrypy/app.py
  - salt/utils/__init__.py
  - tests/integration/modules/test_file.py
  - tests/integration/output/test_output.py
  - tests/unit/grains/test_core.py
2017-12-01 11:12:44 -05:00
Nicole Thomas
e5a1401b82
Merge pull request #44712 from Ch3LL/ssh_pillar_items
Add pillar ssh integration tests
2017-11-30 10:29:32 -05:00