valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
98,586 Commits 24 Branches 182 Tags 341 MiB
314a699519
Commit Graph

5324 Commits

Author SHA1 Message Date
Daniel Wallace
209a1d0fa7
remove extra imports 2018-10-23 11:28:54 -05:00
Mike Place
ce6e5ed6d4
Merge pull request #50170 from rallytime/bp-win_runas-fix 
Skip the win_runas util test on non-windows
 2018-10-23 08:37:48 -06:00
rallytime
1040f507cc
Lint fix: add skipIf import and remove unused import 2018-10-23 09:54:02 -04:00
rallytime
a46f9c3dcd
Skip the win_runas util test on non-windows 2018-10-23 09:20:41 -04:00
rallytime
b9f61323b5
Merge branch '2018.3' into 'fluorine' 
No conflicts.
 2018-10-22 14:41:20 -04:00
Daniel Wozniak
0ece06ef66
Merge pull request #50085 from dwoz/win_pkg_redux 
Fix `test_win_pkg` yet again
 2018-10-19 11:16:15 -07:00
Mike Place
68bd12968a
Merge pull request #50112 from rallytime/merge-fluorine 
[fluorine] Merge forward from 2018.3 to fluorine
 2018-10-19 05:46:34 -06:00
Daniel Wallace
677b9bdfa4
mark log jid test as flaky 2018-10-18 14:54:09 -05:00
Gareth J. Greenaway
adb1e79723
Apply scheduler fixes and tests from #49104 to 2018.3 2018-10-18 08:27:59 -07:00
rallytime
82e73fe49d
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - doc/ref/tops/all/index.rst
  - salt/fileclient.py
  - salt/grains/core.py
  - salt/modules/win_file.py
  - salt/pillar/__init__.py
  - salt/utils/http.py
 2018-10-18 10:41:42 -04:00
Mike Place
f22630eacb
Merge branch '2018.3' into win_pkg_redux 2018-10-18 13:06:31 +02:00
Nicole Thomas
c3387a70bf
Merge pull request #50093 from rallytime/flaky-lxd-tests 
Mark lxd_container integration tests as flaky
 2018-10-17 15:45:36 -04:00
Nicole Thomas
d0c68df885
Merge pull request #49878 from rallytime/merge-fluorine 
[fluorine] Merge forward from 2018.3 to fluorine
 2018-10-17 13:58:31 -04:00
rallytime
045bb0df1d
Mark lxd_container integration tests as flaky 2018-10-17 10:28:17 -04:00
rallytime
8609064f30
Update old utils paths to use new paths 2018-10-17 10:24:26 -04:00
rallytime
a984ad8b3d
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-10-17 10:21:42 -04:00
Nicole Thomas
7ec3840d25
Merge pull request #49794 from twangboy/fix_groupadd_test 
Fix possible issue with test_groupadd
 2018-10-17 10:20:33 -04:00
Daniel A. Wozniak
9f5722a71d
The test is not a flush problem 2018-10-16 22:22:49 -07:00
Daniel A. Wozniak
128c2c5423
Flush and sync file contents 2018-10-16 12:40:23 -07:00
Daniel Wallace
4c4bb5a489
Merge pull request #49987 from terminalmage/pillar_roots 
Make Pillar no longer munge file_roots
 2018-10-15 16:58:08 -05:00
Gareth J. Greenaway
931ec6154a
Fixing test_vault for python3. 2018-10-15 12:07:56 -07:00
Gareth J. Greenaway
90adb38b5d
Updating the integration.sdb.test_vault setup function to attempt to recreate the container if the login test fails. 2018-10-15 12:07:56 -07:00
Daniel Wozniak
fef7669a15
Merge pull request #49809 from Ch3LL/win_pkg_flaky 
Add additional asserts to help investigate test_win_pkg failure
 2018-10-13 11:00:08 -07:00
Daniel A. Wozniak
beaab2a05a
Fix win_pkg test 
Bugfix in file_list cache. The file_list cache age could be a negative
number meaning the file_list cache can get used in tests even though the
cache timeout is set to 0 for test suite runs.
 2018-10-11 15:47:44 -07:00
Erik Johnson
58f5fde03c
Make Pillar no longer munge file_roots 
Pillar and the local fileclient used to use the same class, but this
changed a few years ago with the introduction of FSClient (which enabled
non-roots fileserver backends in masterless Salt). Since Pillar is the
only thing that uses this client, there is no longer a reason to make
Pillar modify file_roots.
 2018-10-10 13:10:50 -05:00
Nicole Thomas
e427306da7
Merge pull request #49907 from brejoc/2018.3-fix-for-list-compound-targeting 
2018.3 fix for list compound targeting
 2018-10-10 09:33:39 -04:00
rallytime
eff2e6fa0b
Fix file patch tests on CentOS 6 2018-10-09 11:50:23 -04:00
rallytime
df11c396ec
Skip pillar refresh test 
This test is flaky and fails intermittently, even with the `flaky` decoractor.

Skipping for now until we can debug further.
 2018-10-09 10:26:45 -04:00
Daniel A. Wozniak
e5ea3f1956
Try running fsync to avoid fs caching race condition 2018-10-06 12:49:49 -07:00
Jochen Breuer
7d0b20c91e
Minor fix for def test_batch_run_grains_targeting 
item was never "minion" without a colon, but os_grain was overwritten
anyway. So this fix does not actually affect the test outcome.
 2018-10-05 09:02:15 +02:00
Daniel A. Wozniak
1005b91690
Debug win_pkg 2018-10-04 15:34:10 -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
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
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
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
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
rallytime
46c0e50638
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - doc/man/salt.7
 2018-10-03 09:45:20 -04:00
Gareth J. Greenaway
76f9e4877a
Fixing lint 2018-10-02 15:53:28 -07:00
Gareth J. Greenaway
200e0ea1cf
Updating various scheduler tests to ensure they're passing on OS X 2018-10-02 14:53:46 -07:00
rallytime
b53c3e695a
Update old utils paths to use new utils paths 2018-10-02 15:12:58 -04:00