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
95,129 Commits 24 Branches 182 Tags 341 MiB
c9546dfb08
Commit Graph

13975 Commits

Author SHA1 Message Date
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
Erik Johnson
ac0f8000d8
Fix 3 bugs in subdict matching 
1. Non-ascii was causing a UnicodeDecodeError when matching
2. Matching a dict value after a wildcard (i.e. the key is the wildcard)
   did not work. This is because it was matching the pattern against the
   key, instead of the value as it should have.
3. It was not possible to use a wildcard for the first level of
   matching.
 2018-09-26 13:26:39 -05:00
Daniel A Wozniak
2a901e960d
Fix issue 49043 2018-09-25 23:27:28 -07:00
twangboy
af1ed1c4e3
Add/fix tests 
Use named parameters where possible
 2018-09-25 16:48:16 -06: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
e7bbb83f45
Merge pull request #49720 from cstarke/2018.3 
Seperate prlctl and prlsrvctl checks into each requiring function
 2018-09-21 09:32:46 -04:00
cstarke
4f8476b2ad Fix tests; add test for CommandExecutionError 2018-09-21 11:39:43 +02: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
536fce611f
Increase function timeout 2018-09-20 09:30:17 -06:00
cstarke
3c96dd2b5e Fix tests for parallels module 2018-09-20 16:46:22 +02:00
Daniel A. Wozniak
ed4de6385d
Fix file serialize test 2018-09-19 22:47:07 -06:00
Daniel A. Wozniak
5ac3738ea9
Merge remote-tracking branch 'saltstack/2018.3' into whitelist 2018-09-19 19:08:50 -06:00
Daniel A. Wozniak
1f60753a47
Do not use close_fds on Windows OS 2018-09-19 19:07:41 -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
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
d19c67f619
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-09-19 09:59:32 -04:00
rallytime
7ff24e5fb8
Mark orchestration test as expensive 2018-09-18 20:02:50 -04:00
Gareth J. Greenaway
f4ccc75587
Removing mocking of os.path.join from two tests, one of which was failing when used with coverage argument. No reason we should be mocking os.path.join. 2018-09-18 16:58:48 -06:00
twangboy
3600467a04
Fix some try/except blocks, mark a lazy test 2018-09-18 10:56:51 -06:00
William Giokas
fde757517f
Order the runtests suites 
Uses an ordered dictionary instead of a default python dict when
describing the `TEST_SUITES` variable. Sorts alphabetically based on the
name of the suite.
 2018-09-18 10:04:02 -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
Mike Place
9d8cc0b3f4
Merge pull request #49662 from dwoz/2018.3.3 
Fix another bad filename reference in whitelist
 2018-09-14 16:20:48 -06:00
Daniel A. Wozniak
e109023013
Fix another bad filename reference in whitelist 2018-09-14 15:36:30 -06:00
Nicole Thomas
6391560d57
Merge pull request #49655 from dwoz/2018.3.3 
Fix windows test whitelist errors
 2018-09-14 16:34:55 -04:00
Daniel A. Wozniak
8a4946478e
Fix windows test whitelist errors 2018-09-14 10:42:04 -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
Daniel A. Wozniak
dbe40df7de
Increase timeout for flaky git test 2018-09-07 16:46:34 -07:00
Daniel A Wozniak
aa07b3fa43
Multiple unittest fixes for 2018.3 Python 3 Windows 2018-09-07 15:16:56 -07:00
rallytime
a00aba9192
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-09-07 16:19:19 -04:00
Nicole Thomas
8b971e5e5a
Merge pull request #49533 from silenius/2018.3.3 
[cherry-pick] Optimize postgres groups management
 2018-09-07 14:58:56 -04:00
Nicole Thomas
1a41b473ce
Merge pull request #49543 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-09-07 14:19:31 -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
Daniel Wozniak
06935e9211
Merge pull request #49528 from dwoz/mergetests 
Fix merge wart
 2018-09-06 16:12:38 -07:00
Gareth J. Greenaway
180692ccee
Disable various boto tests when run under python 3.7 because of //github.com/spulec/moto/issues/1706. which was causing the test suite to hang on unit tests. This PR is disabling the tests in the test_boto_vpc state tests. 2018-09-06 17:21:33 -04:00
Gareth J. Greenaway
0f5191ef7e
Disable various boto tests when run under python 3.7 because of //github.com/spulec/moto/issues/1706. which was causing the test suite to hang on unit tests. This PR is disabling the tests in the test_boto_vpc state tests. 2018-09-06 12:34:47 -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
Nicole Thomas
d9f09da5d9
Merge pull request #49536 from rallytime/bp-49524 
Back-port #49524 to 2018.3.3
 2018-09-06 12:00:00 -04:00
Pablo Suárez Hernández
cf27069dcb
Fix some pylint issues 2018-09-06 16:49:36 +01:00
Dmitry Kuzmenko
7eb8d6c374 Postgress module unit test fix. 2018-09-06 17:28:04 +02:00
Nicole Thomas
c3468250f4
Merge pull request #49521 from terminalmage/fix-splay-executor 
Fix _get_hash in splay executor
 2018-09-06 10:06:53 -04:00
Gareth J. Greenaway
9e7203e08a
Disable various boto tests when run under python 3.7 because of //github.com/spulec/moto/issues/1706. which was causing the test suite to hang on unit tests. 2018-09-06 09:36:35 -04:00
Pablo Suárez Hernández
a0ed59dad9
Fix recursive cases on linux_acl.absent state 2018-09-06 11:37:37 +01:00
Pablo Suárez Hernández
4a018490b8
Add unit tests to cover recursive cases of linux_acl states 2018-09-06 11:37:37 +01:00
Daniel A. Wozniak
6a4f8239d7
Fix merge wart 2018-09-05 23:34:45 -07:00
Gareth J. Greenaway
5ec5578fe1
Disable various boto tests when run under python 3.7 because of //github.com/spulec/moto/issues/1706. which was causing the test suite to hang on unit tests. 2018-09-05 19:47:21 -07:00
Ch3LL
50237e9daf
Skip test_virt and pip_state requirements tests on macosx 2018-09-05 17:49:07 -04:00
Erik Johnson
bbb8fe8540
Fix _get_hash in splay executor 
You can't pass a unicode value to bytearray()
 2018-09-05 16:09:07 -05: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
Daniel Wozniak
56068e9cd9
Merge branch '2018.3' into gitfs_unit 2018-08-31 15:55:52 -07: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
Daniel A. Wozniak
e697ddce76 Work around git-python resource leaks 
Git python keeps file handles open on repositories. This does not see to
effect tests outside of python3 on widows. For now, use a new temporary
for each test on python3 windows.
 2018-08-31 20:17:42 +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
6c92ed2021
Fix review nits 2018-08-31 10:19:16 -04:00
Daniel A. Wozniak
0e18b157e3
Re-factor dedent to fix warts 
- textwarp.dedent does not support bytes on py3
- make sure to preserve trailing newlines
 2018-08-31 10:19:11 -04:00
Daniel A. Wozniak
b5034067f8
Use salt.utils.to_* functions 2018-08-31 10:19:04 -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 Wozniak
64227f9d74
Merge pull request #49459 from dwoz/batch_fix 
Batch test fix cherry-pick
 2018-08-30 16:02:12 -07:00
Daniel Wozniak
75285a34d7
Merge pull request #49453 from dwoz/conffix 
Fix up py3 git config tests
 2018-08-30 15:00:19 -07: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
Nicole Thomas
60758059c3
Merge pull request #49442 from rallytime/bp-49180 
Back-port #49180 and related fixes to 2018.3.3
 2018-08-30 14:02:53 -04:00
Daniel A. Wozniak
ac3c379109
Fix up py3 git config tests 2018-08-30 11:02:00 -07: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 A. Wozniak
e155568957
Fix typo 2018-08-30 10:40:10 -04:00
Daniel A. Wozniak
608a1ae7ba
Account for file renames 2018-08-30 10:39:42 -04:00
Daniel A. Wozniak
e8e6a46a2b
Fix directory unit test 2018-08-30 10:39:37 -04:00
Daniel A. Wozniak
2f865c398e
Fix is_windows checks 2018-08-30 10:39:32 -04:00
Daniel A. Wozniak
6460f7f217
Account for normalized dirs in unit tests 2018-08-30 10:39:28 -04:00
Daniel A. Wozniak
f4b7101a35
Simplify dict keys lookup 2018-08-30 10:39:15 -04:00
Daniel A. Wozniak
942b68bfc8
Fix remaining file state integration tests (py3) 2018-08-30 10:39:05 -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