valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
94,544 Commits 24 Branches 182 Tags 341 MiB
588f744493
Commit Graph

4930 Commits

Author SHA1 Message Date
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
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
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
Daniel A Wozniak
51500ac701
Adding passing windows nacl runner tests to whitelist 2018-09-11 16:43:00 -06: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 Wozniak
5e591ea474
Merge branch '2018.3' into m2crypto_test 2018-09-10 16:03:49 -07: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 Wozniak
faafe74a68
Merge branch '2018.3' into m2crypto_test 2018-09-07 22:58:54 -07:00
Gareth J. Greenaway
d2fb68c8ed
Fixes various tests that were failing under python 3.7. 2018-09-07 20:17:00 -07:00
Daniel A. Wozniak
dbe40df7de
Increase timeout for flaky git test 2018-09-07 16:46:34 -07:00
rallytime
a00aba9192
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-09-07 16:19:19 -04:00
Daniel A. Wozniak
abc9c1acb5
Fix linter issues 2018-09-07 08:03:29 -07:00
Daniel A. Wozniak
8e42384342
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-07 07:46:10 -07:00
Daniel A. Wozniak
2a521586db
Fix encoding issues in file and x509 states 2018-09-07 07:46:10 -07:00
rallytime
4bb09f7910
Skip service module integration tests on CentOS 7 
These are occassionally killing the SSH connection in our Jenkins tests. Let's
skip them for now until we can delve more deeply into this.
 2018-09-06 14:33:03 -04:00
rallytime
cf508a4a50
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - requirements/opt.txt
  - requirements/tests.txt
  - salt/modules/win_service.py
  - tests/integration/states/test_service.py
 2018-09-06 12:08:01 -04:00
rallytime
3ffc6c2520
Merge branch '2018.3.3' into '2018.3' 
Conflicts:
  - tests/integration/states/test_file.py
  - tests/support/helpers.py
  - tests/whitelist.txt
 2018-09-05 09:34:27 -04:00
twangboy
74e944b178
Mark test_service_status_running as flaky 2018-09-04 15:15:31 -06:00
rallytime
2317b5ef58
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/client/ssh/__init__.py
  - tests/integration/modules/test_win_ntp.py
 2018-09-04 12:01:38 -04:00
Mike Place
c69560ccb2
Merge branch '2017.7' into fix_win_service 2018-09-03 08:16:52 -06:00
Nicole Thomas
764b816687
Merge pull request #49454 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-08-31 17:36:33 -04:00
Daniel A. Wozniak
f214929740 Fix a flaky test and mark another as flaky 2018-08-31 20:20:10 +00:00
rallytime
a97a7b0d08
Fix lint and test failures caused by bad merge 2018-08-31 14:08:58 -04:00
Nicole Thomas
53e2e05766
Merge branch '2017.7' into fix_win_service 2018-08-31 13:40:37 -04:00
Daniel A Wozniak
944f8e96c8
Use salt.utils to ensure string type 2018-08-31 10:21:14 -04:00
Daniel A. Wozniak
6399d035a4
Add dedent that sets line endings 2018-08-31 10:18:55 -04:00
Daniel Wallace
0d7180a70e
Revert "Allow for not being prompted to supply a password to deploy keys to a…" 2018-08-30 16:22:29 -05:00
Daniel A. Wozniak
fc39dcf4e4
Simplify cli test fixes 2018-08-30 12:49:41 -07:00
rallytime
f7226f400f
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/osx/build_env.sh
  - salt/modules/win_useradd.py
  - salt/utils/yamldumper.py
  - tests/integration/modules/test_archive.py
  - tests/integration/output/test_output.py
 2018-08-30 14:23:23 -04:00
Nicole Thomas
0cda22e7a9
Merge pull request #49449 from rallytime/flaky-test 
Mark status test as flaky
 2018-08-30 14:10:43 -04:00
Nicole Thomas
bcc5f1a7c1
Merge pull request #49444 from rallytime/bp-49299 
Back-port #49299 to 2018.3.3
 2018-08-30 14:10:20 -04:00
Nicole Thomas
38713e2db9
Merge pull request #49448 from rallytime/bp-49400 
Back-port #49400 to 2018.3.3
 2018-08-30 14:04:28 -04:00
Nicole Thomas
1a67956c0f
Merge pull request #49445 from rallytime/bp-49192 
Back-port #49192 to 2018.3.3
 2018-08-30 14:03:44 -04:00
Nicole Thomas
33f59d44de
Merge pull request #49443 from rallytime/bp-49197 
Back-port #49197 to 2018.3.3
 2018-08-30 14:03:09 -04:00
rallytime
0f322bb39f
Mark status test as flaky 2018-08-30 11:34:05 -04:00
rallytime
b953fe0079
Mark pillar refresh test as flaky 2018-08-30 11:24:33 -04:00
Daniel A. Wozniak
20148d4438
Test fixes 
- Fix tearDown method to remove unicode environment key.
- Mark flaky test as such, test_set_system_time fails when run at
  certian times of the day.
 2018-08-30 10:50:41 -04:00
Daniel A. Wozniak
b8c5a5bb91
Fix string formatting wart in file state tests 2018-08-30 10:48:02 -04:00
Daniel A. Wozniak
19756022be
Fix wart in file state test 2018-08-30 10:48:02 -04:00
Daniel A. Wozniak
ba68388342
Work around cmd.run unicode issues in test for now 
Cat is missing on windows. I tired unsuccesfully to make this work with
the 'type' command on windows. This is maybe not ideal but it stablizes
the test suite for now.
 2018-08-30 10:48:02 -04:00
Daniel A. Wozniak
5fe821978e
File state line ending fixes 2018-08-30 10:44:14 -04:00
Daniel Wallace
0191af1423
flaky tests are flaky yo 2018-08-30 10:18:13 -04:00
Daniel Wallace
720b671dda
mark orchestration state tests as flaky 2018-08-30 10:18:12 -04:00
Nicole Thomas
a962efc009
Merge pull request #49411 from terminalmage/issue49269-2018.3 
Allow our custom yaml dumper to NamespacedDictWrapper objects (2018.3 branch)
 2018-08-30 09:05:36 -04:00
Nicole Thomas
8022a3b494
Merge pull request #49407 from rallytime/pkg-flaky 
Mark pkg module tests and flaky
 2018-08-30 09:01:31 -04:00
Nicole Thomas
7f8c38a77e
Merge pull request #49406 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2018.3.3 to 2018.3
 2018-08-30 09:00:33 -04:00
Nicole Thomas
cf3d2878f2
Merge branch '2017.7' into fix_win_service 2018-08-30 08:58:32 -04:00
Nicole Thomas
03d97507f6
Merge pull request #49434 from dwoz/cleanup_exception_handling 
Clean up exception handling on py3
 2018-08-30 08:56:23 -04:00
Daniel Wallace
7099164fa8
Merge pull request #49389 from gtmanfred/2017.7 
make file envs compatible with fileclient formats
 2018-08-29 18:49:23 -05:00