valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
95,781 Commits 24 Branches 182 Tags 341 MiB
c1ea10f090
Commit Graph

5096 Commits

Author SHA1 Message Date
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
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
rallytime
b53c3e695a
Update old utils paths to use new utils paths 2018-10-02 15:12:58 -04:00
rallytime
a65c60d862
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/state.py
  - salt/utils/hashutils.py
  - tests/integration/modules/test_state.py
 2018-10-02 15:09:51 -04:00
Nicole Thomas
aca87abe40
Merge pull request #49782 from dwoz/issue-49043 
Fix issue 49043
 2018-10-01 09:43:01 -04:00
rallytime
0e761036f1
Merge branch '2018.3.3' into '2018.3' 
No conflicts.
 2018-09-30 12:39:44 -04:00
Mike Place
b7d904f4bb
Merge branch '2018.3' into issue-49043 2018-09-30 09:18:54 -05:00
Daniel Wozniak
ed35633a1f Revert diff newline change 2018-09-28 17:06:36 -07:00
Erik Johnson
8a9945efd2
Update test docstring to reflect switch to using SHA1 2018-09-28 10:05:18 -05:00
Erik Johnson
dca90d7bde
Skip parallel states test on Windows until we can get it to work 2018-09-27 12:16:43 -05:00
Erik Johnson
5a110677b9
Add additional info to the assert to aid in troubleshooting 2018-09-26 14:50:35 -05:00
Erik Johnson
cb19086020
Remove/replace unnecessary setUp/tearDown 
The setUp only needs to run at the beginning so it can be a setUpClass,
and the tearDown logic only applied to a single test and should not be
run after each test.
 2018-09-26 14:50:35 -05:00
Erik Johnson
b3e9678fd9
Fix parallel states with long ID dec or name 
The cache files used for these are based on the state's tag, so longer
ID decs or names will cause errors when the filename's length exceeds
the max allowed by the kernel.

This fixes these errors by taking (up to) the first 32 chars of the
result of base64-encoding the tag, and using that as the parallel cache
filename.
 2018-09-26 14:50:35 -05:00
Daniel Wallace
cf5c179fd9
fix test_managed_file_with_grains_data 
Closes saltstack/salt-jenkins#1121
 2018-09-26 14:49:23 -05:00
twangboy
3d3b67d7d0
Gate for Windows 2018-09-26 13:10:38 -06:00
twangboy
decfa523d1
Check value of result instead of entire dict 2018-09-26 13:06:30 -06:00
Daniel A Wozniak
2a901e960d
Fix issue 49043 2018-09-25 23:27:28 -07:00
Ch3LL
ad0d83c6a8
Add tests with filname in token data 2018-09-25 16:13:31 -04:00
Ch3LL
9756f8f56e
Add empty token salt-api integration tests 2018-09-25 16:13:31 -04:00
Ch3LL
335227145a
Update tornado test to correct authentication message 2018-09-25 11:47:19 -04:00
Daniel A. Wozniak
a44b37a510
Merge remote-tracking branch 'saltstack/2018.3' into whitelist 2018-09-21 15:39:45 -07:00
Daniel A. Wozniak
90489709ce
Add some debug info to assert 2018-09-21 09:05:12 -07:00
Nicole Thomas
d434e3664b
Merge pull request #49684 from twangboy/fix_49675 
Detect when system needs reboot after domain join
 2018-09-20 12:17:49 -04:00
Daniel A. Wozniak
ed4de6385d
Fix file serialize test 2018-09-19 22:47:07 -06:00
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
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
twangboy
3600467a04
Fix some try/except blocks, mark a lazy test 2018-09-18 10:56:51 -06: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
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
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
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
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 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
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
10ec8beb39
Fix linter issues 2018-09-10 10:00:25 -07: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
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
Ch3LL
d520f9acc1
Add tests with filname in token data 2018-09-07 13:55:26 -04:00
Ch3LL
d45f6c7866
Add empty token salt-api integration tests 2018-09-07 13:55:26 -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
Ch3LL
50237e9daf
Skip test_virt and pip_state requirements tests on macosx 2018-09-05 17:49:07 -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
58428003b1
Revert "Allow for not being prompted to supply a password to deploy keys to a…" 2018-08-31 09:57:46 -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
Daniel A. Wozniak
9daa992c6e
Fix group remove test logic 2018-08-29 15:22:41 -07:00
Erik Johnson
82a8b731f0
Allow our custom yaml dumper to NamespacedDictWrapper objects 
This special dict class did not have a representer assigned to it, so
PyYAML would raise an exception when attempting to dump it.

This also removes the name overriding, as its implementation was
ill-conceived and will be deprecated in a later branch (it's only used
in this one place so deprecating should be of no-to-minimal impact).
 2018-08-29 14:50:23 -05:00
Erik Johnson
d02ec34790
Allow our custom yaml dumper to NamespacedDictWrapper objects 
This special dict class did not have a representer assigned to it, so
PyYAML would raise an exception when attempting to dump it.

This also removes the name overriding, as its implementation was
ill-conceived and will be deprecated in a later branch (it's only used
in this one place so deprecating should be of no-to-minimal impact).
 2018-08-29 14:43:10 -05:00
rallytime
1609e1127f
Mark pkg module tests and flaky 
This commit also cleans up several of the tests by defining variable defaults
sooner in the tests or removing unused variables.
 2018-08-29 14:32:57 -04:00
Nicole Thomas
68d630f872
Merge pull request #49401 from rallytime/flaky-output-test 
Mark output file permissions test as flaky
 2018-08-29 14:13:11 -04:00
Nicole Thomas
23610edba1
Merge pull request #49400 from rallytime/flaky-pillar-test 
Mark pillar refresh test as flaky
 2018-08-29 14:12:50 -04:00
rallytime
4939ee3b49
Merge branch '2018.3.3' into '2018.3' 
Conflicts:
  - salt/utils/timed_subprocess.py
  - tests/integration/states/test_file.py
 2018-08-29 13:13:16 -04:00
rallytime
e13216ba86
Mark output file permissions test as flaky 2018-08-29 11:36:24 -04:00
rallytime
fb62af6fdf
Mark pillar refresh test as flaky 2018-08-29 11:33:43 -04:00
Daniel A Wozniak
b332bebb20
Fix archive tests for py3 2018-08-29 00:35:17 -07:00
Daniel Wallace
be7c041d75
add test 2018-08-28 21:14:05 -05:00
Nicole Thomas
af80e64569
Merge pull request #49368 from rallytime/bp-49322 
Back-port #49322 to 2018.3.3
 2018-08-28 13:15:14 -04:00
twangboy
38009660e4
Add tests 2018-08-28 11:03:33 -06:00
rallytime
ab6cc1c741
Update old utils paths to use new paths 2018-08-28 11:41:38 -04:00
rallytime
ac406c49a7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/ext/win_inet_pton.py
  - salt/pillar/git_pillar.py
  - tests/integration/cli/test_batch.py
  - tests/integration/modules/test_archive.py
  - tests/integration/modules/test_pkg.py
  - tests/integration/states/test_file.py
  - tests/support/case.py
  - tests/whitelist.txt
 2018-08-28 11:22:47 -04:00
Daniel A. Wozniak
238853b9ec
Encode shell commands explicitly. 
On Windows subprocess.Popen will try to implicity encode shell commands
using the default system encoding. This will raise an exception if
passed utf-8.
 2018-08-28 10:26:26 -04:00
Daniel A. Wozniak
16ca5b9694
Work around listdir encoding issues on py2 windows 2018-08-28 09:24:16 -04:00
Daniel A. Wozniak
7650208dbc
file state test fixes 
- fix integration.states.test_file.FileTest.test_managed_latin1_diff
- fix integration.states.test_file.FileTest.test_recurse_issue_40578
- fix some issues integration.states.test_file.FileTest.test_issue_8947_utf8_sls,
  this test still fails due to py2 popen's unicode handling.
 2018-08-28 09:24:16 -04:00
Daniel Wozniak
14b8094909
Merge pull request #49346 from Ch3LL/bp-49345 
[2017.7] Backport #49345
 2018-08-27 18:54:31 -07:00
Daniel Wozniak
d8f2945813
Merge pull request #49344 from cachedout/test_matcher_flaky 
Matcher test marked flaky
 2018-08-27 18:50:35 -07:00
Daniel Wozniak
d50324b4b5
Merge branch '2017.7' into more_tests 2018-08-27 16:30:10 -07:00
Daniel A Wozniak
cd6706e9f0
Fix merge wart 2018-08-27 14:36:40 -07:00
Daniel Wallace
7bf5ba83c8
upgrade including linux kernels 
This is required for ubuntu 14.04 to pass.
 2018-08-27 15:11:13 -04:00
Daniel Wallace
ce2733ef9a
upgrade including linux kernels 
This is required for ubuntu 14.04 to pass.
 2018-08-27 15:07:56 -04:00
Mike Place
a34ef2e54d
Matcher test marked flaky 2018-08-27 10:56:55 -06:00
Daniel A. Wozniak
b9c344b7ce
Fix module.archive tests for win py3 2018-08-27 00:44:41 -07:00
Daniel A. Wozniak
ac60fb8190
Comment strange code 2018-08-27 00:44:40 -07:00
Daniel A. Wozniak
5fefd6fe89
Simplify cli test fixes 2018-08-27 00:44:40 -07:00
Daniel A. Wozniak
1765d53367
Fix archive tests on Windows platform 2018-08-27 00:44:39 -07:00
Daniel A. Wozniak
b8af2387cd
Fix indent wart 2018-08-27 00:44:38 -07:00
Daniel A. Wozniak
2733c02b0a
Use double quotes on windows commands 2018-08-27 00:44:36 -07:00
Daniel Wozniak
a2e7033f33
Merge pull request #49331 from dwoz/strfix 
Use salt.utils to ensure string type
 2018-08-25 18:42:07 -07:00
Daniel Wallace
6b2eba7381
Merge pull request #49316 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2018.3.3 to 2018.3
 2018-08-25 14:53:04 -05:00
Daniel A Wozniak
7513474f71
Use salt.utils to ensure string type 2018-08-25 12:19:59 -07:00
Daniel Wozniak
5766e982e7
Merge pull request #49322 from dwoz/state_module_test_fix 
Encode shell commands explicitly.
 2018-08-24 21:43:26 -07:00