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,230 Commits 24 Branches 182 Tags 341 MiB
529687a855
Commit Graph

14041 Commits

Author SHA1 Message Date
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
Nicole Thomas
7a166bc58a
Merge pull request #49376 from twangboy/fix_48608 
Fix issue with duplicates in user.list_users on OSX
 2018-08-30 08:57:54 -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
twangboy
bf32e0ca1d
Merge branch 'fix_48608' of https://github.com/twangboy/salt into fix_48608 2018-08-29 16:41:58 -06:00
twangboy
535d83e39e
Fix test for list_users 2018-08-29 16:39:10 -06:00
Daniel A. Wozniak
9daa992c6e
Fix group remove test logic 2018-08-29 15:22:41 -07:00
Mike Place
24faa5e5ec
Merge pull request #49408 from terminalmage/issue49269 
Allow our custom yaml dumper to NamespacedDictWrapper objects
 2018-08-29 15:20:04 -06: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
5746fc80c2
Merge pull request #49402 from rallytime/bp-49321 
Back-port #49321 to 2017.7
 2018-08-29 14:13:22 -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
7dec9fca0c
Add flaky decorator to serializer test 
Fixes https://github.com/saltstack/salt-jenkins/issues/1093
 2018-08-29 11:43:11 -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
Daniel A. Wozniak
2b08cf1516
Account for more tests that are not in 2017.7 
I also made sure there are no other missing tests since this bit me once
already.
 2018-08-28 14:35:09 -07:00
Daniel A. Wozniak
f9d7dbdb26
The autoruns module has not been renamed 2018-08-28 14:22:05 -07:00
Daniel A. Wozniak
56ea4eebcd
Account for more tests that are not in 2017.7 
I also made sure there are no other missing tests since this bit me once
already.
 2018-08-28 12:13:52 -07:00
twangboy
1641851175
Fix the name of the _cmd_quote test 2018-08-28 11:16:29 -06: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
Nicole Thomas
0fee3e8786
Merge pull request #49363 from rallytime/bp-49245 
Back-port #49245 to 2018.3.3
 2018-08-28 13:14:17 -04:00
Nicole Thomas
dbcd2fc726
Merge pull request #49361 from rallytime/bp-49244 
Back-port  #49244 to 2018.3.3
 2018-08-28 13:12:57 -04:00
twangboy
97567af232
Skip tests on Linux systems 2018-08-28 11:03:34 -06:00
twangboy
38009660e4
Add tests 2018-08-28 11:03:33 -06:00
Nicole Thomas
b4a1e1d365
Merge pull request #49362 from rallytime/bp-49240 
Back-port #49240 to 2018.3.3
 2018-08-28 13:00:25 -04:00
rallytime
cc606509d0
Fix is_windows call - use the right path 2018-08-28 12:58:11 -04:00
Nicole Thomas
9ca9a775ff
Merge pull request #49365 from rallytime/bp-49270 
Back-port #49270 to 2018.3.3
 2018-08-28 12:56:22 -04: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
1b3f37a8b8
Add async helper to test_sock_path_len 
This test function is causing another test:

unit.utils.test_event.TestAsyncEventPublisher.test_event_subscription

To fail with 'Async operation timed out after 5 seconds', Adding the
tornado Async test helper so that both tests pass.
 2018-08-28 09:30:47 -04:00
Daniel A. Wozniak
5db77c6229
Revert newline translation change 
On windows, newlines will be CRLF since we added unix2dos to kitchen.
 2018-08-28 09:28:58 -04:00
Daniel A. Wozniak
5488fbea38
Skip grep unit tests on windows 
These tests are specific to unix like platforms that have grep
installed. On windows we use the win_file module.
 2018-08-28 09:26:35 -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 A. Wozniak
4723c69092
Older GitPython version do not have a close method 2018-08-28 09:22:19 -04:00
Daniel A. Wozniak
d5fecba716
Fix up fileserver.test_gitfs tests on windows 2018-08-28 09:22:19 -04:00
Daniel A. Wozniak
aeb0fa3bfd
custom_grains tests do not exist 2018-08-27 21:30:01 -07: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 Wallace
00b58ee438
Merge pull request #49337 from dwoz/win_service_test_fix 
Fix broken service stop test
 2018-08-27 09:22:37 -05: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
06f271ff19
Add archive module tests to whitelist.txt 2018-08-27 00:44:39 -07:00
Daniel A. Wozniak
9cb8fe28c5
Add more tests to whitelist for windows 2018-08-27 00:44:38 -07:00
Daniel A. Wozniak
b8af2387cd
Fix indent wart 2018-08-27 00:44:38 -07:00
Daniel A. Wozniak
bc971e419e
add doc tests 2018-08-27 00:44:38 -07:00
Daniel A. Wozniak
8899a5ee1a
Add more client tests to whitelist 2018-08-27 00:44:37 -07:00
Daniel A. Wozniak
14cd7b4830
Add cli tests to whitelist 2018-08-27 00:44:37 -07:00
Daniel A Wozniak
3e55d10584
Platform module doesn't exist in 2017.7 2018-08-27 00:44:36 -07:00
Daniel A. Wozniak
2733c02b0a
Use double quotes on windows commands 2018-08-27 00:44:36 -07:00
Daniel A. Wozniak
0394ece642
The set command does not work like inline env vars 
Remove set command prefix on windows since it can not be run inline with
other commands.
 2018-08-27 00:44:35 -07:00
Daniel A. Wozniak
1c1727e8fd
Fix broken service stop test 2018-08-26 18:34:47 -07:00
Daniel A. Wozniak
19911987b7
Fix review nits 2018-08-26 17:03:16 -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 Wallace
be6691d91b
Merge pull request #49323 from Ch3LL/skip_git 
Skip nonexistent branch test for git versions <1.7.10
 2018-08-25 14:52:47 -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
Daniel Wozniak
b47da0aff7
Merge pull request #49299 from dwoz/test_fix 
Work around cmd.run unicode issues in test for now
 2018-08-24 21:43:02 -07:00
Ch3LL
ee3d32f74e
Skip nonexistent branch for git versions <1.7.10 2018-08-24 18:11:32 -04:00
Daniel A. Wozniak
1f7d50d194
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-24 14:27:02 -07:00
Daniel A. Wozniak
f4bd644a4b
Fix string formatting wart in file state tests 2018-08-24 12:09:37 -07:00
rallytime
39c442ca1c
Merge branch '2018.3.3' into '2018.3' 
Conflicts:
  - salt/modules/file.py
  - tests/integration/states/test_file.py
 2018-08-24 14:08:30 -04:00
Daniel A. Wozniak
6abc2daf56
Re-factor dedent to fix warts 
- textwarp.dedent does not support bytes on py3
- make sure to preserve trailing newlines
 2018-08-24 10:46:50 -07:00
Daniel Wallace
b65890c363
Merge pull request #49305 from terminalmage/issue48299 
Allow git.latest to remove local tags which have been removed remotely
 2018-08-24 12:29:02 -05:00
rallytime
1a5ef996e3
Add 'minion_data_cache: True' to mocked opts for minions unit tests 2018-08-24 13:00:43 -04:00
Nicole Thomas
914bb09667
Merge pull request #49282 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-08-24 12:45:49 -04:00
Daniel A. Wozniak
75b2e3d990
Use salt.utils.to_* functions 2018-08-24 09:35:02 -07:00
Daniel A. Wozniak
fa78a7b2ee
Add dedent that sets line endings 2018-08-24 09:35:00 -07:00
rallytime
21a51c9336
Add 'minion_data_cache: True' to mocked opts for minions unit tests 2018-08-24 09:44:15 -04:00
Erik Johnson
4a093d97fb
lint 2018-08-24 06:40:36 -05:00
Erik Johnson
ed7b99453c
Gate tag manipulation behind a sync_tags argument 2018-08-24 06:40:36 -05:00
Erik Johnson
29de855ede
Add test for a removed tag 2018-08-24 06:40:36 -05:00
Daniel A. Wozniak
e84e60857c
Fix wart in file state test 2018-08-23 21:00:35 -07:00
Daniel A. Wozniak
71d4465b6c
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-23 16:21:20 -07:00
rallytime
196ce3f75e
Call the with_tempfile decorator correctly for 2018.3 2018-08-23 16:37:03 -04:00
rallytime
37f24fda78
Fix unit test for file state 
Chose the wrong side of a merge conflict resolution. This commit restores
the correct testing behavior.
 2018-08-23 16:18:29 -04:00
Ch3LL
0a5d44a3db
Move run_function call from __init__ to setup 2018-08-23 15:34:27 -04:00
Michael Calmer
6224f7b551
calling range is going up to the upper limit but not including it 2018-08-23 13:08:04 -04:00
Nicole Thomas
158c1ca575
Merge pull request #49276 from terminalmage/fix-moved-funcs 
Fix paths to moved functions
 2018-08-23 12:38:54 -04:00
rallytime
6f9a158661
Update old utils paths with new paths 2018-08-23 11:52:49 -04:00
rallytime
c3ecefc785
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/file.py
  - salt/modules/win_service.py
  - salt/states/mount.py
  - salt/states/service.py
  - tests/integration/__init__.py
  - tests/integration/runners/test_state.py
  - tests/integration/states/test_file.py
  - tests/unit/states/test_file.py
 2018-08-23 11:50:41 -04:00
Erik Johnson
322a988def
Fix paths to moved functions 2018-08-23 08:32:11 -05:00
Daniel A. Wozniak
51bf79afd9
Add async helper to test_sock_path_len 
This test function is causing another test:

unit.utils.test_event.TestAsyncEventPublisher.test_event_subscription

To fail with 'Async operation timed out after 5 seconds', Adding the
tornado Async test helper so that both tests pass.
 2018-08-22 14:49:34 -07:00
Daniel Wozniak
ec32428f9b
Merge pull request #49244 from dwoz/gitfs_fixes 
Test fixes: unit.fileserver.test_gitfs
 2018-08-22 13:19:41 -07:00
Erik Johnson
6b51f71e40
Fix failing unit file module unit tests 
This just looks to have been incorrectly handled in a merge-forward.
 2018-08-22 14:22:44 -05:00
Daniel Wozniak
4634752b7e
Merge pull request #49240 from dwoz/state_tests 
file state test fixes
 2018-08-22 11:16:41 -07:00
Mike Place
395bae6486
Merge pull request #49259 from gtmanfred/flaky-2017.7 
[2017.7] flaky tests
 2018-08-22 10:40:53 -06:00
Mike Place
55ded9f03d
Merge pull request #49260 from gtmanfred/flaky-2018.3 
[2018.3] flaky tests
 2018-08-22 10:40:38 -06:00
Daniel Wallace
41973ff6c0
flaky tests are flaky yo 2018-08-22 11:38:48 -05:00
Daniel Wallace
c927f1bc2b
mark orchestration state tests as flaky 2018-08-22 11:38:40 -05:00
Daniel Wallace
93a576ef63
flaky tests are flaky yo 2018-08-22 11:38:23 -05:00
Daniel Wallace
f518bd3efc
mark orchestration state tests as flaky 2018-08-22 11:37:43 -05:00
Mike Place
6d023cab6e
Merge pull request #49245 from dwoz/skip_grep_windows 
Skip grep unit tests on windows
 2018-08-22 09:18:07 -06:00
Daniel A. Wozniak
5a0cda51ed
Older GitPython version do not have a close method 2018-08-22 03:27:48 -07:00
Daniel A Wozniak
72c37271a5
Use six to make sure content is unicode 2018-08-22 01:05:53 -07:00
Daniel A. Wozniak
e30589194e
Skip grep unit tests on windows 
These tests are specific to unix like platforms that have grep
installed. On windows we use the win_file module.
 2018-08-22 00:08:12 -07:00
Daniel A. Wozniak
74527158ec
Fix up fileserver.test_gitfs tests on windows 2018-08-21 23:45:59 -07:00
Daniel A. Wozniak
1679a19732
Work around listdir encoding issues on py2 windows 2018-08-21 21:53:12 -07:00
Daniel A. Wozniak
86e3c46959
Revert newline translation change 
On windows, newlines will be CRLF since we added unix2dos to kitchen.
 2018-08-21 20:43:41 -07:00
Daniel A Wozniak
1bf0b18224
Better blockfix replace 2018-08-21 16:15:11 -07:00
Daniel A Wozniak
dd4fcd3445
Revert "Multiple block replace test fixes" 
This reverts commit 94ac2b4fc7.
 2018-08-21 16:15:10 -07:00
twangboy
d3358423ae
Use os.linesep.join instead of textwrap.dedent 2018-08-21 16:15:07 -07:00
Daniel A. Wozniak
07ed84197d
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-21 14:10:41 -07:00
Ch3LL
f5b42dbb24
import salt.utils.yaml 2018-08-21 16:28:06 -04:00
Ch3LL
67290eaff7
Use yaml's safe_dump in windows ec2 tests 2018-08-21 16:15:27 -04:00
Daniel Wallace
644ba3d34c
Merge pull request #49197 from dwoz/test_fix 
File state line ending fixes
 2018-08-20 13:45:03 -05:00
Daniel A. Wozniak
a7cfe355d7
File state line ending fixes 2018-08-19 13:09:23 -07:00
Daniel A. Wozniak
8ea89e943f
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-18 20:59:36 -07:00
Daniel Wozniak
5f905d7260
Merge pull request #49188 from cachedout/fix_test_pkg 
Fix bug in test_pkg
 2018-08-18 10:36:22 -07:00
Mike Place
6fb8d4a33f
Merge pull request #49056 from Ch3LL/test_mine 
Add orch runner with mine.get integration tests
 2018-08-18 08:54:47 -04:00
Mike Place
2cd6519ad9
Fix bug in test_pkg 
Grains were being referenced but not required.
 2018-08-18 08:31:43 -04:00
Mike Place
0157eacffc
Merge pull request #49164 from terminalmage/issue49154 
Fix bug in keep_source for non-templated salt:// file sources
 2018-08-18 08:11:57 -04:00
Mike Place
134f125b96
Merge pull request #49182 from terminalmage/salt-jenkins-1078 
Fix hanging syndic test
 2018-08-18 08:10:31 -04:00
Daniel A. Wozniak
95efc516ba
Fix typo 2018-08-17 21:39:22 -07:00
Erik Johnson
a2d2cd317b
Fix hanging syndic test 
There was no `syndic_master` and the fallback DNS lookup failed. This
caused a traceback which hung the test suite.
 2018-08-17 17:30:22 -05:00
Daniel A. Wozniak
3c49544c19
Account for file renames 2018-08-17 15:06:41 -07:00
Daniel A. Wozniak
acc144d6a9
Fix directory unit test 2018-08-17 14:08:58 -07:00
Daniel A. Wozniak
913ea5ebde
Fix directory unit test 2018-08-17 14:07:19 -07:00
Daniel Wozniak
b3a247bfbb
Merge pull request #49172 from Ch3LL/bp-49118 
[2018.3.3] cherry pick #49118
 2018-08-17 13:54:04 -07:00
Daniel A. Wozniak
a7ee07ab81
Fix is_windows checks 2018-08-17 13:48:31 -07:00
Daniel A. Wozniak
74b197f643
Account for normalized dirs in unit tests 2018-08-17 13:36:41 -07:00