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
94,625 Commits 24 Branches 182 Tags 341 MiB
4a54c7c164
Commit Graph

13845 Commits

Author SHA1 Message Date
Daniel A. Wozniak
4a54c7c164
Fix file serialize test 2018-09-19 11:21:13 -06:00
Daniel A. Wozniak
0ec1e1eca3
Increase timeout on flaky test 2018-09-19 11:21:13 -06:00
Daniel A. Wozniak
6ae924b85f
Skip test that is not applicable on windows 2018-09-19 11:21:13 -06:00
Daniel A. Wozniak
598020079f
Increase timeout on flaky test 2018-09-19 11:21:12 -06:00
Daniel A. Wozniak
1757eddae1
Increase ModuleTest.run_function timeout 
Reduce flakyness with greater timeout
 2018-09-19 11:21:12 -06:00
Daniel A Wozniak
7c7353c5f6
Add more tests to whitelist 2018-09-19 11:21:10 -06:00
rallytime
7ff24e5fb8
Mark orchestration test as expensive 2018-09-18 20:02:50 -04:00
Daniel Wozniak
2e1bf1335a
Merge branch '2018.3' into add_whitelist 2018-09-16 10:49:21 -06:00
Daniel A Wozniak
2340a5875f
Fix runner returns test on Windows 2018-09-15 15:14:40 -06:00
rallytime
a8a38205e7
Merge branch '2018.3.3' into '2018.3' 
Conflicts:
  - tests/unit/utils/test_stringutils.py
 2018-09-14 09:33:33 -04:00
rallytime
186f57eede
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/network.py
 2018-09-13 17:11:18 -04:00
Nicole Thomas
3c8ec8a22f
Merge pull request #49644 from rallytime/mark-flaky-test 
Mark grains test as flaky
 2018-09-13 14:25:05 -04:00
Nicole Thomas
3fb3ffdb37
Merge pull request #49641 from rallytime/bp-49632 
Back-port #49632 to 2018.3.3
 2018-09-13 12:46:01 -04:00
rallytime
be8a187b4d Mark grains test as flaky 2018-09-13 16:17:02 +00:00
rallytime
accef8c7dd
Skip some unreliable tests 
We need to investigate these more in the future, but let's skip them for now
so we can see some better signaling.
 2018-09-13 10:33:59 -04:00
rallytime
8e74d1c9e4
Skip some unreliable tests 
We need to investigate these more in the future, but let's skip them for now
so we can see some better signaling.
 2018-09-13 10:31:08 -04:00
Nicole Thomas
e319ecc9f6
Merge pull request #49629 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2018.3.3 to 2018.3
 2018-09-13 10:00:07 -04:00
Gareth J. Greenaway
d11a400825
Fixing failing test under python 3.7 causaed by changes to how os.makedirs sets initial permissions. 2018-09-13 09:52:57 -04:00
Nicole Thomas
370de07617
Lint: Add extra blank line 2018-09-12 17:05:34 -04:00
Gareth J. Greenaway
27b93fcc68
Moving the test_build_whitespace_split_regex test into the TestBuildWhitespaceRegex class. 2018-09-12 14:38:10 -06:00
Gareth J. Greenaway
588f744493
Fixing failing test under python 3.7 causaed by changes to how os.makedirs sets initial permissions. 2018-09-12 14:25:57 -06:00
rallytime
b628ad729b
Merge branch '2018.3.3' into '2018.3' 
Conflicts:
  - tests/integration/states/test_file.py
 2018-09-12 12:35:00 -04:00
Nicole Thomas
7042fc0f75
Merge pull request #49580 from garethgreenaway/fixing_failing_test_python_3_7 
[2018.3] Fixing tests for Python 3.7
 2018-09-12 12:33:35 -04:00
Daniel Wozniak
f908cde7f7
Merge branch '2018.3' into add_whitelist 2018-09-12 10:04:00 -06:00
Nicole Thomas
ab19082a7a
Merge pull request #49606 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-09-12 10:26:33 -04:00
Nicole Thomas
0ce91d60fc
Merge pull request #49620 from dwoz/nacltest 
Adding passing windows nacl runner tests to whitelist
 2018-09-12 10:19:10 -04:00
Nicole Thomas
c1f97c4733
Merge pull request #49532 from meaksh/2018.3-fix-linux_acl-recursive-problems 
Fix wrong 'recurse' behavior on for linux_acl.present/absent states
 2018-09-12 10:16:15 -04:00
Daniel A Wozniak
51500ac701
Adding passing windows nacl runner tests to whitelist 2018-09-11 16:43:00 -06:00
rallytime
0f3881ab4f
Skip flaky test on Python 3 
Even with the flaky decorator, this test sometimes passes and sometimes fails.

Let's skip it for now.
 2018-09-11 14:15:52 -04:00
rallytime
c168268229
Update old utils paths to use new paths 2018-09-11 12:54:50 -04:00
rallytime
19598d8802
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/osx/build_env.sh
  - salt/cloud/clouds/proxmox.py
  - salt/minion.py
  - salt/modules/win_lgpo.py
  - salt/netapi/rest_tornado/__init__.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/returners/local_cache.py
  - salt/returners/rawfile_json.py
  - salt/utils/minions.py
 2018-09-11 12:51:52 -04:00
Daniel A. Wozniak
9e3b44d6af
Fix linter issues 2018-09-11 08:47:51 -07:00
Daniel A. Wozniak
ca1b05e36d
Fix multiple issues in x509 module and state 
Adding a regression test for #49008 and patching the x509 module and
state to make the test pass.
 2018-09-11 08:47:50 -07:00
Daniel A. Wozniak
e603e7a4f2
Fix encoding issues in file and x509 states 2018-09-11 08:47:50 -07:00
Daniel A. Wozniak
2959da0f99
Add some runners test files to whitelist 2018-09-11 08:38:16 -07:00
Daniel A. Wozniak
bee29024f5
Make windows file remove return like others 2018-09-11 08:37:46 -07:00
Daniel Wozniak
5e591ea474
Merge branch '2018.3' into m2crypto_test 2018-09-10 16:03:49 -07:00
Nicole Thomas
e3a14e3535
Merge pull request #49594 from rallytime/bp-49580 
Back-port #49580 to 2018.3.3
 2018-09-10 15:59:40 -04:00
Erik Johnson
729dc0819f
Kill bare excepts with fire 
These prevent the signal handlers from shutting down a process via a
raising a SystemExit. They are ticking time bombs of race conditions
that leave processes running when daemons are shut down or restarted.

Friends don't let friends use bare excepts.
 2018-09-10 13:19:03 -06:00
Daniel A. Wozniak
5770b05612
Fix hitelist file order 2018-09-10 10:05:43 -07:00
Daniel A. Wozniak
10ec8beb39
Fix linter issues 2018-09-10 10:00:25 -07:00
rallytime
41a2586fc0
Add file coding line at top of file 
This was accidentally removed during a merge conflict resolution
 2018-09-10 12:45:43 -04:00
Gareth J. Greenaway
7df3bebf53
Fixing lint. 2018-09-10 12:43:55 -04:00
Gareth J. Greenaway
5fee38d1db
Fixes various tests that were failing under python 3.7. 2018-09-10 12:43:55 -04:00
Daniel A Wozniak
ccbcb5588a
Add more tests to whitelist for Windows 2018-09-10 09:34:27 -07:00
rallytime
5de2245c11
Update old utils paths to use new utils paths 2018-09-10 09:14:24 -04:00
Nicole Thomas
9004422d84
Merge pull request #49571 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-09-10 08:58:14 -04:00
Daniel Wozniak
faafe74a68
Merge branch '2018.3' into m2crypto_test 2018-09-07 22:58:54 -07:00
Gareth J. Greenaway
b6afdae7c9
Fixing lint. 2018-09-07 20:17:00 -07:00
Gareth J. Greenaway
d2fb68c8ed
Fixes various tests that were failing under python 3.7. 2018-09-07 20:17:00 -07:00