valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
86,562 Commits 24 Branches 182 Tags 341 MiB
94ac2b4fc7
Commit Graph

11224 Commits

Author SHA1 Message Date
Daniel A Wozniak
94ac2b4fc7
Multiple block replace test fixes 2018-08-06 13:35:21 -07:00
Nicole Thomas
905da13653
Merge branch '2017.7' into cmd_win_tests 2018-08-03 15:10:29 -04:00
Nicole Thomas
f8bfab4f9f
Merge pull request #48890 from Ch3LL/cmd_test 
add sleep in test_cmd integration test
 2018-08-02 15:15:07 -04:00
Nicole Thomas
52722f6ded
Merge pull request #48885 from rallytime/flaky-tests-shadow 
Mark shadow module integration test as flaky
 2018-08-02 15:04:34 -04:00
Ch3LL
acda4ed9ab
add sleep in test_cmd integration test 2018-08-02 13:36:33 -04:00
Nicole Thomas
38d9eae537
Merge branch '2017.7' into flaky-tests-matchers 2018-08-02 13:29:57 -04:00
Nicole Thomas
0ca0b6f2f2
Merge pull request #48883 from terminalmage/salt-jenkins-1023 
Fix failing git worktree tests
 2018-08-02 12:51:39 -04:00
rallytime
da871a2d57
Mark shadow module integration test as flaky 
This test fails sometimes, so let's mark it as flaky.

I have tried to reproduce the failure and fix it, but to no avail.

Let's mark it as flaky for now.
 2018-08-02 11:12:35 -04:00
rallytime
3660dff13c
Separate compound matcher tests into individual tests 
When one match fails (and some of these can be flaky) the whole test fails.

This makes it somewhat difficult to track down why the test fails.

I am hoping we won't need the sleeps in this change when the tests are separate,
but let's see how that goes. It worked fine in my testing.

I also updated the test to use pytest notation, rather than unittest.
 2018-08-02 10:42:03 -04:00
Erik Johnson
c61f75cb50
Fix failing git worktree tests 
Git 2.18.0 changed the output format against which some of the asserts
in this test are performed. Instead of displaying the full path to the
worktree, it now references the branch name instead. This test updates
the asserts to look for the basename instead, which should allow it to
pass on Git releases both before and after 2.18.0.
 2018-08-02 09:26:27 -05:00
Nicole Thomas
a84f5155a1
Merge pull request #48869 from Ch3LL/mac_shell_tests 
Catch socket.error exception in testprogram
 2018-08-02 10:19:22 -04:00
Ch3LL
3734b1ec89
Catch socket.error exception in testprogram 2018-08-01 16:35:16 -04:00
rallytime
7320aa9104
Skip unreliable tornado test. 
Even with the flaky decorator, it still fails _sometimes_. This is not
a useful test as it sits. Skipping it for now.
 2018-08-01 15:46:03 -04:00
Ch3LL
9312a993a5
Add cmd module integration tests for windows and fix space in path issue 2018-08-01 14:05:52 -04:00
Nicole Thomas
05f2d65de3
Merge pull request #48853 from rallytime/bp-48850 
Back-port #48850 to 2017.7
 2018-07-31 16:21:48 -04:00
Nicole Thomas
8a1285239a
Merge pull request #48426 from garethgreenaway/46689_fixing_pkg_held_when_package_is_installed 
[2017.7] fixes to states/pkg.py
 2018-07-31 16:18:04 -04:00
rallytime
3c33ee554a
Skip tests in integration.shell.test_master 
Related to https://github.com/saltstack/salt-jenkins/issues/378

This is likely causing all of the flakiness we're seeing on test runs
when the master stops responding.

These tests should be in their own, isolated run, rather than with
the rest of the test suite.
 2018-07-31 15:22:34 -04:00
Gareth J. Greenaway
11cb86e6eb
General cleanup in pkg state, reducing duplicate code. Fixing the requires_salt_modules decorator, sys.doc was returning too much information for the event to handle. This change specifically calls sys.doc with the module name. 2018-07-31 09:46:05 -07:00
Gareth J. Greenaway
16fb6ae635
Make sure pkg.hold and pkg.unhold are available before running the test. 2018-07-31 09:46:05 -07:00
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