Commit Graph

98530 Commits

Author SHA1 Message Date
Jochen Breuer
6a5f3cd041
No longer passes missing in list compound engine
Missing targets cause a very odd behaviour in combination with a
"not" statement and don't seem to be used in every other case.

Having a compound list target like "not L@foominion" would cause
a return for "foominon" even though it doesn't exist. Returning
an empty list for "missing" fixes that.
2018-10-05 09:02:12 +02:00
Daniel A. Wozniak
75dd5aba10
Merge branch '2018.3' into shelltests 2018-10-04 15:49:38 -07:00
Daniel A. Wozniak
e76a751954
Use os.path.split for more consistancy 2018-10-04 15:43:50 -07:00
Daniel A. Wozniak
bc54d15e9a
Fix wart in spm on windows 2018-10-04 15:43:50 -07:00
Daniel A. Wozniak
df5e27156e
Add spm tests for windows 2018-10-04 15:43:50 -07:00
Daniel A. Wozniak
1005b91690
Debug win_pkg 2018-10-04 15:34:10 -07:00
Nicole Thomas
760d8f447e
Merge branch '2018.3' into issue48661_2018.3 2018-10-04 17:05:21 -04:00
Nicole Thomas
4eb43aff04
Merge pull request #49896 from rallytime/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
2018-10-04 17:00:23 -04:00
Nicole Thomas
abab8a3dc5
Merge pull request #49898 from rallytime/skip-test-cent6
Skip ansiblegate state integration test on CentOS 6
2018-10-04 16:59:50 -04:00
lomeroe
f72ca81a1d add comments on user right assignment policies when they are already set
and note if cumulative_rights_assignment is True that the particular
user is already granted the right
2018-10-04 14:10:01 -05:00
Daniel A. Wozniak
7bd34f6c2c
Connect before processing presence
fire_event's timeout is in milliseconds. Under the hood it calls
connect_pull with a seconds timeout. Just call connect_pull directly
before processing presense events.
2018-10-04 11:21:25 -07:00
Daniel A. Wozniak
19072f0cd6
Use os.path.split for more consistancy 2018-10-04 10:17:26 -07:00
Ch3LL
9dce5cc7ba
Fix the assertion message order 2018-10-04 12:10:45 -04:00
Ch3LL
18e9a2831a
Add additional asserts to help investigate test_win_pkg failure 2018-10-04 12:03:06 -04:00
twangboy
01bd847bcd
Gate the win_function a little better 2018-10-04 10:02:59 -06:00
twangboy
a66765fc4c
Remove arrInstalled artifact 2018-10-04 09:49:12 -06:00
rallytime
817d810a6f
Skip ansiblegate state integration test on CentOS 6
This test is hanging the test suite when running on CentOS 6. I don't think
this has ever worked properly (this test is new to fluorine) on CentOS 6, so
this will need some further investigation.

Fixes https://github.com/saltstack/salt-jenkins/issues/1138

Skipping for now until we can come back to this.
2018-10-04 11:27:10 -04:00
rallytime
41c8b3107f
Merge branch '2017.7' into '2018.3'
No conflicts.
2018-10-04 09:05:10 -04:00
Nicole Thomas
b9590339d6
Merge pull request #49739 from twangboy/fix_49660
Populate changes dictionary on system.join_domain
2018-10-04 09:02:53 -04:00
Daniel Wozniak
71669bdd17
Merge pull request #49885 from dwoz/gemfile
Gemfile updates
2018-10-03 22:32:34 -07:00
Daniel A. Wozniak
6c224591b9
Merge remote-tracking branch 'origin/shelltests' into shelltests 2018-10-03 18:44:02 -07:00
Daniel A. Wozniak
8bfa634f3c
Fix warts in integration.shell.test_matcher 2018-10-03 18:43:44 -07:00
Daniel A. Wozniak
45d2142c7d
Fix wart in test_cp module 2018-10-03 18:43:43 -07:00
Daniel A. Wozniak
0e4fbc5b50
Add syndic tests to whitelist.txt for Windows 2018-10-03 18:43:43 -07:00
Daniel A. Wozniak
f72ad01ba4
Fix wart in spm on windows 2018-10-03 18:43:43 -07:00
Daniel A. Wozniak
4141cc82e9
Add spm tests to whitelist.txt for Windows 2018-10-03 18:43:43 -07:00
Daniel A. Wozniak
02ad722e02
Add more shell integration tests to whitelist 2018-10-03 18:43:43 -07:00
Daniel Wozniak
48275c0072
Add shell.test_key to whitelist and fix wart 2018-10-03 18:43:43 -07:00
Daniel Wozniak
e5edff4154
Skip tests not valid on windows 2018-10-03 18:43:42 -07:00
Daniel Wozniak
a3897290e8
Add shell cp tests and fix them 2018-10-03 18:43:42 -07:00
Nicole Thomas
fb7e71435b
Merge pull request #49879 from rallytime/bp-49862
Back-port #49862 to fluorine
2018-10-03 15:29:55 -04:00
Nicole Thomas
4897056574
Merge pull request #49881 from rallytime/flaky-test
Mark one of the cherrypy tests as flaky
2018-10-03 15:03:43 -04:00
Daniel A. Wozniak
791e3ff37b
Use dwoz/winrm-fs for chunked downloads
Revert this after there is an upstream release
2018-10-03 11:44:39 -07:00
Daniel A. Wozniak
f3999e1457
Move vagrant to it's own group
Better support for ec2 on laptops that also have vagrant installed.
2018-10-03 11:44:39 -07:00
twangboy
bcdb3667ae
Skip on non-windows systems 2018-10-03 10:16:28 -06:00
Nicole Thomas
43b292f770
Merge branch '2018.3' into shelltests 2018-10-03 12:13:14 -04:00
twangboy
02f63351b2
Fix some lint 2018-10-03 10:09:08 -06:00
rallytime
2bb6d9771d
Mark one of the cherrypy tests as flaky
This test fails occassionally, but not consistently. Let's mark it as
flaky for now.
2018-10-03 11:06:14 -04:00
Matt Phillips
d1bd1f8ce9
add back missing_minion nodegroup, needed by other tests 2018-10-03 10:51:10 -04:00
Matt Phillips
9ce56a999f
fix lint 2018-10-03 10:51:06 -04:00
Matt Phillips
bb7d5dc930
move tests that exercise missing minions into local setup/teardown
having the config global to the test suite was causing log spam.
2018-10-03 10:51:00 -04:00
Neile Havens
c38bb7dcab
Merge branch '2018.3' into optimize-firewalld-state 2018-10-03 09:02:27 -05:00
Nicole Thomas
85478cd2b3
Merge pull request #49745 from MTecknology/fix-49744
Remove all users from group when members list is empty.
2018-10-03 09:48:39 -04:00
rallytime
46c0e50638
Merge branch '2018.3' into 'fluorine'
Conflicts:
  - doc/man/salt.7
2018-10-03 09:45:20 -04:00
Nicole Thomas
47838dfcde
Merge pull request #49871 from garethgreenaway/1134_scheduler_tests_failing_osx
[fluorine] Updating scheduler tests for OS X
2018-10-03 09:31:17 -04:00
Nicole Thomas
05cd56b476
Merge pull request #49867 from rallytime/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
2018-10-03 09:23:34 -04:00
Daniel Wallace
42b540bab4
Merge pull request #49876 from KaiSforza/ci_actually_fail_2018
Actually catch the exception when we fail
2018-10-03 07:26:57 -05:00
William Giokas
c88a81d059
Actually catch the exception when we fail
This should actually cause builds to fail when any part in the try block
fails. We still delete instances and try junit rendering, but if things
fail then they get marked on github as failed.
2018-10-03 14:18:43 +02:00
Daniel Wallace
0662e37e0c
Merge pull request #49870 from KaiSforza/ci_actually_fail
Actually catch the exception when we fail
2018-10-02 19:51:49 -05:00
twangboy
8ecbe0eb08
Add tests for check_perms
Fix some docs
2018-10-02 18:18:55 -06:00