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
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
Daniel Wallace
a18d937156
Merge pull request #49167 from dwoz/filefix 
Fix remaining file state integration tests (py3)
 2018-08-17 13:36:03 -07:00
Daniel Wozniak
85ffc8db87
Merge pull request #49173 from Ch3LL/bp-49167 
[2018.3.3] cherry pick #49167
 2018-08-17 13:30:26 -07:00
Daniel A. Wozniak
3363238ff6
Account for normalized dirs in unit tests 2018-08-17 13:17:08 -07:00
Daniel A. Wozniak
a1a298a13c
Simplify dict keys lookup 2018-08-17 11:45:07 -04:00
Daniel A. Wozniak
3d26affa10
Fix remaining file state integration tests (py3) 2018-08-17 11:45:07 -04:00
Ch3LL
ce5e17bdbd
update is_windows salt.utils to correct path 2018-08-17 11:40:50 -04:00
Daniel A. Wozniak
3fef112409
Multiple fixes for integration.states.test_file 
- Fix wart in PR #49087 file://c:\foo\bar vs c:\foo\bar local paths
- Finalize fix for test_issue_8343_accumulated_require_in
- Fix wart in PR #49088 Ignore proper directory test
 2018-08-17 11:36:40 -04:00
Mike Place
58034c9dc3
Merge pull request #49132 from Ch3LL/bp-49062 
[2018.3.3] backport PR #49062
 2018-08-17 16:51:49 +02:00
Mike Place
7043286d6c
Merge pull request #49143 from Ch3LL/bp-49142 
[2017.7] Backport #49142
 2018-08-17 16:40:39 +02:00
Mike Place
c2aba7abde
Merge branch '2017.7' into issue49154 2018-08-17 16:14:08 +02:00
Erik Johnson
8bda1e5ae3
Merge pull request #49091 from terminalmage/rename-test-files 
Rename/re-organize test files in 2018.3 branch
 2018-08-17 07:26:43 -05:00
Daniel A. Wozniak
b5ba073d65
Simplify dict keys lookup 2018-08-16 23:33:52 -07:00
Daniel A. Wozniak
6844251315
Fix remaining file state integration tests (py3) 2018-08-16 19:57:39 -07:00
Erik Johnson
b4544d7f89
Add keep_source integration tests 2018-08-16 14:53:32 -05:00
Daniel A. Wozniak
3384864e8f
add Exception type 2018-08-16 11:57:28 -07:00
Daniel A. Wozniak
9da79dd0b5
Allow test suite to finish if tmp dir removal fails 2018-08-16 10:48:19 -07:00
Ch3LL
d2e73cc988
Remove -Z script_arg for cloud tests 2018-08-15 17:35:23 -04:00
Ch3LL
a1ef6a88a6
Remove -Z script_arg for cloud tests 2018-08-15 17:27:02 -04:00
Ch3LL
3a8fed5e57
Handle race condition when running mine.update in orch mine test 2018-08-15 13:16:26 -04:00
Ch3LL
b4e421c3d6
Add orch runner with mine.get integration tests 2018-08-15 13:16:26 -04:00
Wesley Whetstone
990fdb6a52
decorator link fix, updating context names, as well as updating macutils tests for latest changes 2018-08-15 11:43:20 -04:00
Mike Place
c8510a6b96
Merge pull request #49062 from weswhet/fix-mac-available-services 
fix memoize on available macOS services
 2018-08-15 17:34:24 +02:00
Erik Johnson
ec258e235d
Add integration tests for yaml and json filters 2018-08-14 17:02:17 -05:00
Wesley Whetstone
f1b40c4411
decorator link fix, updating context names, as well as updating macutils tests for latest changes 2018-08-14 14:24:33 -07:00
Erik Johnson
3d8523b031
Fix import for moved module 2018-08-14 13:53:31 -05:00
Erik Johnson
613f0611f8
Lint 2018-08-14 13:53:31 -05:00
Erik Johnson
81f272f91a
Rename outputter tests to match naming convention 2018-08-14 13:53:31 -05:00
Erik Johnson
fba03360f4
Rename venafi test module to bring it closer to the naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
9c145009da
Rename exec module integration test files to respect naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
91fa09ec79
Rename providers to clouds to respect naming convention 
Also, move rackspace openstack-based tests to test_openstack.py
 2018-08-14 13:53:30 -05:00
Erik Johnson
d56dcdd608
Rename "providers" dir to "clouds" to respect naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
f1b7d54fdd
Rename virtualenv state test module to respect naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
c1f94dbf1b
Split ssh state tests into separate modules to respect naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
9c8ba4a633
Split mysql database tests into two modules to respect naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
d51748eea2
Rename some files to avoid them being identified as test modules 2018-08-14 13:53:30 -05:00
Erik Johnson
1fccbf764a
Rename acl unit test module to confirm to naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
160223dc80
Consolidate/move fileclient/fileserver tests to conform to naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
1aacf77b3e
Rename/consolidate salt.utils unit tests to conform to naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
5a0990b087
Rename pillar unit test modules to reflect naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
516594b164
Consolidate netapi tests and move them to reflect naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
8f5fef55d4
Consolitdate and move salt-ssh unit tests to proper location 2018-08-14 13:53:30 -05:00
Erik Johnson
9801ce3271
Consolidate and move loader tests to test/unit/test_loader.py 2018-08-14 13:53:29 -05:00
Erik Johnson
f72bbc5036
Rename beacon unit test modules to conform with naming convention 
Also consolidate pyroute2 network_settings tests into network_settings
beacon test module.
 2018-08-14 13:53:29 -05:00
Erik Johnson
fa76cb6ada
Move inspectlib tests to conform with naming convention 2018-08-14 13:53:29 -05:00
Erik Johnson
81e38239fe
Move shared kernelpkg test cases to tests/support/ 2018-08-14 13:53:29 -05:00
Erik Johnson
e0d95b640f
Consolidate misplaced tests into tests/unit/test_config.py 2018-08-14 13:53:29 -05:00
Erik Johnson
3a1ec12613
Rename slack engine test file to respect naming convention 2018-08-14 13:53:29 -05:00
Erik Johnson
c9c9d20f19
Rename test_map_conf test file to respect naming convention 2018-08-14 13:53:29 -05:00
Erik Johnson
5c936c016d
Rename the aptpkg state module to respect naming convention 2018-08-14 13:53:29 -05:00
Erik Johnson
ac50eb84e1
Remove redundant "test" from filename 2018-08-14 13:53:29 -05:00
Erik Johnson
b03a56355b
Move jinja templating tests alongside salt/utils/jinja.py's tests 2018-08-14 13:53:29 -05:00
Erik Johnson
b49d8df210
Fix bad copypasta in docstring 2018-08-14 13:53:29 -05:00
Erik Johnson
069102b82d
Rename sentry returner test to match naming convention 2018-08-14 13:53:29 -05:00
Erik Johnson
23980830d1
Use tests.support.paths instead of deprecated integration module 2018-08-14 13:53:29 -05:00
Erik Johnson
ffb842d055
Move salt.utils.context tests to their proper location 2018-08-14 13:53:28 -05:00
Erik Johnson
d69069be13
Move context cache tests to their proper location 2018-08-14 13:53:28 -05:00
Daniel A. Wozniak
c6b781eea5
Multiple fixes for integration.states.test_file 
- Fix wart in PR #49087 file://c:\foo\bar vs c:\foo\bar local paths
- Finalize fix for test_issue_8343_accumulated_require_in
- Fix wart in PR #49088 Ignore proper directory test
 2018-08-14 11:43:21 -07:00
rallytime
4649f60209
Update old utils paths with new paths 2018-08-14 09:52:40 -04:00
rallytime
49c2a784bb
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/file.py
  - salt/modules/reg.py
  - salt/states/reg.py
  - tests/integration/states/test_file.py
 2018-08-14 09:48:13 -04:00
Nicole Thomas
bc033da677
Merge pull request #49071 from rallytime/bp-49034 
Back-port #49034 to 2018.3
 2018-08-13 16:15:30 -04:00
Nicole Thomas
90c2f026b3
Merge pull request #49077 from rallytime/bp-49075 
Back-port #49075 to 2018.3
 2018-08-13 15:59:59 -04:00
Daniel A. Wozniak
054afb8197
Multiple file state test fixes 
- Account for hash differences due to line endings
- Ignore tests that are not valid on windows
- Other test fixes due to line endings
 2018-08-13 12:29:25 -07:00
Nicole Thomas
0e1ed7b923
Merge pull request #49055 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-08-13 15:20:10 -04:00
Daniel Wallace
5e07b8306b
fix last async issue 2018-08-13 12:25:49 -04:00
rallytime
83a15cb623
Add optimization_order config to mocked opts 2018-08-13 12:06:48 -04:00
Gareth J. Greenaway
8108a4d31a
Adding some tests for the grains, pillar and mine functions in the cache runner. These will also ensure that the relevant functions in salt.utils.master.MasterPillarUtil are functioning properly. 2018-08-13 10:47:47 -04:00
Nicole Thomas
b0d5acbe0d
Merge pull request #49052 from isbm/isbm-python37-support-2018.3 
Python 3.7 support (backport 2018.3)
 2018-08-13 09:06:50 -04:00
Nicole Thomas
338ecb70ef
Merge pull request #49026 from dwoz/issue_48557 
Fix file.line line endings
 2018-08-13 09:05:41 -04:00
Daniel Wallace
4386a9ca1f
Merge branch '2018.3' into isbm-python37-support-2018.3 2018-08-10 15:47:12 -05:00
rallytime
ea6883ee55
Update old utils paths to new utils paths 2018-08-10 13:15:53 -04:00
rallytime
201031fa8a
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - 	doc/man/salt.7
  - 	doc/ref/configuration/minion.rst
  - 	salt/cloud/clouds/ec2.py
  - 	salt/returners/highstate_return.py
  - 	tests/support/gitfs.py
  - 	tests/unit/loader/test_loader.py
 2018-08-10 13:12:14 -04:00
Daniel Wallace
6bc44c91c4
remove localhost from tests 
now that enable_ssh_minions is turned off, remove localhost from
returns.
 2018-08-10 09:03:35 -05:00
Daniel Wallace
7b168a5aac
disable enable_ssh_minions to see if it is slowing down 2018.3 tests 2018-08-10 09:03:35 -05:00
Bo Maryniuk
47078a300f Remove async keyword, moving it into the kwargs. 2018-08-10 15:59:24 +02:00
Bo Maryniuk
31dccc4fdf fix unicode literals 2018-08-10 15:59:24 +02:00
Bo Maryniuk
35eaebb8a4 Fix docstrings 2018-08-10 15:59:23 +02:00
Bo Maryniuk
b7da571624 Fix imports 2018-08-10 15:52:01 +02:00
rallytime
ed6fb8b739
Merge branch '2017.7.8' into '2017.7' 
No conflicts.
 2018-08-10 09:08:47 -04:00
Gareth J. Greenaway
fa2339bb91
The osfullname grain differs when using Python2 vs Python3, swapping this out for the "OS" grain which is consistent. 2018-08-09 17:12:06 -07:00
Ch3LL
0dedfae4d1
increase timeout on vultr cloud integration test 2018-08-09 17:33:56 -04:00
Nicole Thomas
4eeb75f028
Merge pull request #49033 from terminalmage/issue48996 
Fix file.get_diff for remote files
 2018-08-09 17:06:52 -04:00
Nicole Thomas
c606a32cf2
Merge pull request #49042 from rallytime/flaky-jinja-test 
Mark a jinja template test as flaky
 2018-08-09 17:05:53 -04:00
Nicole Thomas
b24c96a292
Merge pull request #48926 from travispaul/fix-netbsd-8-new-ifconfig 
Handle ifconfig output differently for NetBSD >= 8.0
 2018-08-09 16:07:43 -04:00
rallytime
a43d9b4ba6
Mark a jinja template test as flaky 
Fixes https://github.com/saltstack/salt-jenkins/issues/1059
 2018-08-09 15:51:34 -04:00
Nicole Thomas
7d6b9ed0a5
Merge pull request #48803 from dmurphy18/aix_filesystems 
Support for execution modules and states mount on AIX
 2018-08-09 13:51:54 -04:00
Nicole Thomas
702e76cfc9
Merge branch '2018.3' into issue_48557 2018-08-09 13:47:06 -04:00
Nicole Thomas
9b6a9ff4f1
Merge pull request #48932 from twangboy/fix_win_repo 
Fix pkg.install when pkg already installed
 2018-08-09 13:45:50 -04:00
Nicole Thomas
d7b7a92ef6
Merge pull request #49011 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-08-09 13:34:17 -04:00
Erik Johnson
d6e5038022
Fix file.get_diff for remote files 
Once the files were cached, the function was still trying to open the
paths passed into it, not the cached paths. This fixes that and adds
additional unit tests.
 2018-08-09 10:56:05 -05:00
Nicole Thomas
3325b7d4c0
Merge pull request #48985 from garethgreenaway/48123_file_directory_recurse_fails_broken_symlink 
[2018.3] Fix to salt/modules/file.py
 2018-08-09 11:03:08 -04:00
rallytime
f08ee6c6ae
Update netapi client tests 
This change does 2 things:
- Skip 2 tests: they are not actually _testing_ anything, just running functions
  Let's skip these for now until we can dedicate some time to investigate what
  should be tested here. This will also help the tests breath a little bit.
- Add a small sleep to the async test. This test needs a little breathing room so
  the procs don't get stepped on. I think this is what is causing the master to
  shut down sometimes during test runs:

```
08:41:47          test_wheel_async (integration.netapi.test_client.NetapiClientTest)
08:41:47        [CPU:0.0%|MEM:13.2%]  ... 12:41:47,280 [salt.utils.process                         :670 ][ERROR   ] An un-handled exception from the multiprocessing process 'SignalHandlingMultiprocessingProcess-24' was caught:
08:41:47        Traceback (most recent call last):
08:41:47          File "/tmp/kitchen/testing/salt/utils/process.py", line 663, in _run
08:41:47            return self._original_run()
08:41:47          File "/usr/lib/python3.5/multiprocessing/process.py", line 93, in run
08:41:47            self._target(*self._args, **self._kwargs)
08:41:47          File "/tmp/kitchen/testing/salt/client/mixins.py", line 457, in _proc_function
08:41:47            salt.utils.daemonize()
08:41:47          File "/tmp/kitchen/testing/salt/utils/__init__.py", line 514, in daemonize
08:41:47            os.dup2(dev_null.fileno(), sys.stdout.fileno())
08:41:47        io.UnsupportedOperation: fileno
08:41:47        Process SignalHandlingMultiprocessingProcess-24:
08:41:47        Traceback (most recent call last):
08:41:47          File "/usr/lib/python3.5/multiprocessing/process.py", line 249, in _bootstrap
08:41:47            self.run()
08:41:47          File "/tmp/kitchen/testing/salt/utils/process.py", line 663, in _run
08:41:47            return self._original_run()
08:41:47          File "/usr/lib/python3.5/multiprocessing/process.py", line 93, in run
08:41:47            self._target(*self._args, **self._kwargs)
08:41:47          File "/tmp/kitchen/testing/salt/client/mixins.py", line 457, in _proc_function
08:41:47            salt.utils.daemonize()
08:41:47          File "/tmp/kitchen/testing/salt/utils/__init__.py", line 514, in daemonize
08:41:47            os.dup2(dev_null.fileno(), sys.stdout.fileno())
08:41:47        io.UnsupportedOperation: fileno
```
 2018-08-09 10:11:20 -04:00
rallytime
00416d54d1
Revert "add key-deploy test" 
This reverts commit 5b443af7ae.
 2018-08-09 09:50:40 -04:00
Travis Paul
d59b6d8269
Add unit test for NetBSD 8 ifconfig changes 
lint changes in salt/utils/network.py
 2018-08-09 21:26:08 +08:00
Nicole Thomas
d353c02a8c
Merge pull request #49019 from garethgreenaway/47695_fixing_scheduler_bug_when_enabled_is_present 
[2018.3] Fix to scheduler when global enabled key is present
 2018-08-09 09:06:25 -04:00
rallytime
ca82b3d57a
Merge branch '2017.7.8' into merge-2017.7 2018-08-09 08:44:07 -04:00