valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
95,871 Commits 24 Branches 182 Tags 341 MiB
58eede65a7
Commit Graph

8458 Commits

Author SHA1 Message Date
Bo Maryniuk
9d4960752e Expand unit test to verify part name 2018-10-09 16:36:53 +02:00
Bo Maryniuk
712083df0e Add unit test for broken CPE_NAME 2018-10-09 14:11:56 +02:00
Bo Maryniuk
1306ddb111 Add unit test for v2.3 of CPE format 2018-10-09 14:11:42 +02:00
Bo Maryniuk
04b61d3795 Add unit test for WFN format of CPE_NAME 2018-10-09 14:11:23 +02:00
Gareth J. Greenaway
dd96c130fb
Fixing lint. 2018-10-05 22:27:52 -07:00
Gareth J. Greenaway
ac7da89432
Tweaking a couple tests to account for new scenarios with later versions. 2018-10-05 19:04:51 -07:00
Gareth J. Greenaway
9265195deb
Updating the mysql update to handle changes in version 8.0.11 where PASSWORD was removed. Updating unit tests. 2018-10-05 18:06:48 -07:00
Nicole Thomas
c0e240461a
Merge pull request #49872 from twangboy/fix_49861 
Fix issues with windows file permissions when using reset=True
 2018-10-05 09:52:06 -04:00
twangboy
01bd847bcd
Gate the win_function a little better 2018-10-04 10:02:59 -06:00
twangboy
bcdb3667ae
Skip on non-windows systems 2018-10-03 10:16:28 -06:00
twangboy
8ecbe0eb08
Add tests for check_perms 
Fix some docs
 2018-10-02 18:18:55 -06: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
30ccc5e369
Merge branch '2018.3' into 49520_multimaster_dns_issue_fix 2018-09-30 12:34:55 -04:00
twangboy
7a9278b825
Fix broken tests, add new tests 2018-09-28 14:59:27 -06:00
Nicole Thomas
fccc08cb31
Merge pull request #49815 from isbm/isbm-ipv6-scope-errors-2018.3 
Bugfix/rework: IPv6 scope errors (bp)
 2018-09-28 15:44:58 -04:00
Bo Maryniuk
c14f26f351 Reverse skipping tests: if no ipaddress 2018-09-28 16:31:22 +02:00
Bo Maryniuk
bb37ba0578 Add IPv6 scoped test 2018-09-28 15:49:05 +02:00
Bo Maryniuk
facb34a6cc Add additional check 2018-09-28 15:43:39 +02:00
Bo Maryniuk
615b09aea1 Lintfix: W0611 2018-09-28 15:43:26 +02:00
Bo Maryniuk
0498e946f9 Fix ipaddress imports 2018-09-28 15:34:05 +02:00
Gareth J. Greenaway
e66dc18805
Updating the resolve_dns function in minion.py to include a new minion configuration option which will control how many attempts will be made when the master hostname is unable to be resolved before giving up. 2018-09-27 08:44:06 -07: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
twangboy
af1ed1c4e3
Add/fix tests 
Use named parameters where possible
 2018-09-25 16:48:16 -06:00
cstarke
4f8476b2ad Fix tests; add test for CommandExecutionError 2018-09-21 11:39:43 +02:00
cstarke
3c96dd2b5e Fix tests for parallels module 2018-09-20 16:46:22 +02:00
rallytime
d19c67f619
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-09-19 09:59:32 -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
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
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
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
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
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
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
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
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
aa07b3fa43
Multiple unittest fixes for 2018.3 Python 3 Windows 2018-09-07 15:16:56 -07: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
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
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
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
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
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
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
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
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
Daniel A. Wozniak
ac3c379109
Fix up py3 git config tests 2018-08-30 11:02:00 -07: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
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
twangboy
535d83e39e
Fix test for list_users 2018-08-29 16:39:10 -06: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
twangboy
1641851175
Fix the name of the _cmd_quote test 2018-08-28 11:16:29 -06: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
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
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
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
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
1c1727e8fd
Fix broken service stop test 2018-08-26 18:34:47 -07: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
rallytime
21a51c9336
Add 'minion_data_cache: True' to mocked opts for minions unit tests 2018-08-24 09:44:15 -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
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
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
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
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
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
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 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 A. Wozniak
3363238ff6
Account for normalized dirs in unit tests 2018-08-17 13:17:08 -07: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
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
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
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
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
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
rallytime
83a15cb623
Add optimization_order config to mocked opts 2018-08-13 12:06:48 -04: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
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
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
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
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
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
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
David Murphy
92818f816b Fixes for testing 2018-08-08 12:15:59 -06:00
David Murphy
77dd7a1743 Adjust unit tests 2018-08-08 12:15:59 -06:00
David Murphy
9fb5641dc7 Mount unit tests for modules and states for AIX 2018-08-08 12:15:59 -06:00
David Murphy
b28f427432 Save off work after laptop issue 2018-08-08 12:15:59 -06:00
Erik Johnson
0441cd56ef
Add optimization_order to mocking 2018-08-08 11:22:52 -05:00
Erik Johnson
a78663a301
Lint 2018-08-08 11:22:52 -05:00
Erik Johnson
764969ce08
Add a test to confirm that .py files are still loaded correctly 
Also, use USE_IMPORTLIB to gate testing on optimization_order, since
this only works with Python 3.5+.
 2018-08-08 11:22:52 -05:00
Erik Johnson
e7c10196da
Quiet the byte compiling for PY2 2018-08-08 11:22:52 -05:00
Erik Johnson
9338370477
Add unit tests for loader optimization levels 2018-08-08 11:22:52 -05:00
rallytime
9f0b9a1073
Update expected return value in boto test 
The expected return from moto has changed from `-1` to `None` in the
latest version of moto (1.3.4). This PR updates the test to be in line
with the return from moto.
 2018-08-08 10:44:38 -04:00
rallytime
1a23bb233f
Update expected return value in boto test 
The expected return from moto has changed from `-1` to `None` in the
latest version of moto (1.3.4). This PR updates the test to be in line
with the return from moto.
 2018-08-08 10:42:57 -04:00
rallytime
d0136b1be5
Update expected return value in boto test 
The expected return from moto has changed from `-1` to `None` in the
latest version of moto (1.3.4). This PR updates the test to be in line
with the return from moto.
 2018-08-08 09:16:55 -04:00
Nicole Thomas
ab1a713bc3
Merge pull request #48934 from terminalmage/issue48777 
Properly handle latin-1 encoding in file diffs
 2018-08-07 17:02:23 -04:00
twangboy
47b2898a85
return empty dict on no changes 2018-08-07 12:25:15 -06:00
Erik Johnson
52c64e4d51
Fix to_unicode test 
Since latin-1 is not being automatically decoded, we need to explicitly
pass it on the test.
 2018-08-07 09:57:21 -05:00
twangboy
6532706d2f
Make the tests run on Linux 2018-08-06 17:55:46 -06:00
twangboy
cfe55a391a
Add tests for pkg.install output 2018-08-06 17:53:37 -06:00
Erik Johnson
d39fa889f3
Add stringutils.get_diff to mocks 2018-08-06 15:27:13 -05:00
Erik Johnson
f14f4dae22
Add unit test for latin-1 fallback, multi-encoding 2018-08-03 18:38:08 -05:00
Nicole Thomas
0272cadff8
Merge branch '2018.3' into unit_state 2018-08-03 16:30:28 -04:00
Ch3LL
b82dd708be
skip getpwnam check on mac in unit test_cmdmod 2018-08-02 16:39:49 -04:00
Ch3LL
5896c7fc36
remove base_top_file file in teardown and add sleep 2018-08-02 16:05:41 -04:00
Gareth J. Greenaway
0791b0a03c
FileGrepTestCase tests back to 2018.3 2018-07-31 09:33:58 -07:00
Gareth J. Greenaway
2e01c55e7e
Fixing a bug that prevents specifying wildcards for filenames. 2018-07-31 09:33:58 -07:00
Daniel Wozniak
69f81214d1
Merge pull request #48714 from dwoz/state_echo_fix 
Always transfer bytes from fileserver roots
 2018-07-30 15:37:12 -07:00
Daniel A. Wozniak
ce3ed43dab
Always use unix line endings 2018-07-30 11:41:58 -07:00
Erik Johnson
52fc1c955d
Simplify file contents in roots fileserver test 
This removes the need to hard code contents in the test. The roots
fileserver just reads from the file in binary mode, so we should be able
to do the same in the test to confirm the correct behavior of the roots
backend.
 2018-07-27 09:16:59 -05:00
Nicole Thomas
6978ce5d1d
Merge pull request #48747 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-07-26 14:14:33 -04:00
Daniel A Wozniak
a89019e956
Multiple windows test fixes 2018-07-24 23:09:14 -07:00
rallytime
4122da40b5
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/integration/netapi/rest_tornado/test_app.py
  - tests/integration/states/test_service.py
 2018-07-24 14:28:33 -04:00
Nicole Thomas
062fe7cccf
Merge pull request #48718 from garethgreenaway/48536_beacon_diskusage_fixes 
[2018.3] beacon diskusage fixes
 2018-07-24 13:45:25 -04:00
Nicole Thomas
e873621009
Merge pull request #48711 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-07-24 13:38:57 -04:00
Daniel Wozniak
04ab17a4d6
Merge pull request #48726 from dwoz/syslogtest 
Skip test when syslog not available
 2018-07-24 09:12:44 -07:00
Daniel A. Wozniak
6e7824266b
Windows compatible cp test 2018-07-23 23:27:29 -07:00
Daniel A. Wozniak
00f04cfd59
Skip test when syslog not available 2018-07-23 23:11:42 -07:00
Daniel A. Wozniak
95329acb1e
Fileserver transfers bytes 2018-07-23 13:24:47 -07:00
Gareth J. Greenaway
38a65e8fb3
Fixing test_diskusage_nomatch and test_diskusage_match_regex 2018-07-23 11:02:57 -07:00
Gareth J. Greenaway
6ecca166ff
Updating psutil.disk_partitions to pull in all mounts not just the physical ones. Check to see if the mount point from the configuration ends with a $ (regular expression end of line) if not we add one in to ensure that a simple / does not end up matching all mount points. Updating tests accordingly. 2018-07-23 11:02:57 -07:00
Nicole Thomas
801eae3b8d
Merge pull request #48672 from frogunder/45012 
add service enabled test
 2018-07-23 11:38:48 -04:00
rallytime
ea5c063237
Update old utils paths to use new paths 2018-07-23 11:32:08 -04:00
rallytime
e740d3b208
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/client/ssh/state.py
  - salt/client/ssh/wrapper/state.py
  - salt/modules/dockermod.py
  - salt/modules/npm.py
  - salt/modules/testinframod.py
  - tests/integration/modules/test_mac_system.py
  - tests/integration/modules/test_mac_timezone.py
  - tests/integration/ssh/test_state.py
  - tests/integration/states/test_user.py
  - tests/unit/modules/test_npm.py
  - tests/unit/states/test_file.py
 2018-07-23 11:15:43 -04:00
Alexander Duryagin
ebcd3b1c6b
fixed test for svn.export 2018-07-23 10:58:48 -04:00
Nicole Thomas
ead19725b6
Merge branch '2017.7' into fix_48169 2018-07-20 10:45:59 -04:00
Nicole Thomas
dfc1582475
Merge pull request #48304 from Ch3LL/swap_mac 
Fix macosx grains when swapusage returns comma
 2018-07-20 10:30:58 -04:00
Frode Gundersen
0747f2e58a
add service enabled test 2018-07-19 16:47:56 +00:00
William Yardley
7ff3c9c5ff
Improve handling of npm json output (#43138) 
Rather than look for [ or { at the beginning of a line to identify the json
output, just use salt.utils(.json).findjson.
 2018-07-18 21:42:28 -07:00
Nicole Thomas
6973152057
Merge pull request #48534 from xetix/fix-zypper-latest_version 
Fix behaviour of function latest_version in zypper module when multip…
 2018-07-13 15:56:05 -04:00
Nicole Thomas
9985f0b4c1
Lint: remove extra blank line 2018-07-13 15:55:08 -04:00
Nicole Thomas
4b16537a29
Merge pull request #48579 from Ch3LL/fix_syslog 
Fix python2 syslog returner expecting string bytes not unicode
 2018-07-13 15:50:15 -04:00
Daniel A Wozniak
136ddf5f54
Finally fix prepend for real 2018-07-13 11:25:27 -07:00
Ch3LL
d8288a0ffc
add unicode type for syslog test for tag 2018-07-13 12:39:09 -04:00
Ch3LL
17e69382d5
Fix python2 syslog returner expecting string bytes not unicode 2018-07-13 12:35:41 -04:00
Daniel A Wozniak
66b25e65bf
Fix failing prepend test 
The prepend test is failing when jenkins runs kithchen but is passing in
my test environment. Make sure each test starts without the 'etc' path
existing.
 2018-07-12 19:04:47 -07:00
Patrik
5fbead8a36
Merge branch '2017.7' into fix-zypper-latest_version 2018-07-12 21:05:54 +02:00
xetix
db35d0c1e1 Adding testcase for this fix. 2018-07-12 20:58:16 +02:00
Daniel A Wozniak
c858bf477f
Remove which mock to get the test passing 
This test passes in my local kitchen tests when the which mock is
removed. However, I added this mock to try and get the test passing in
jenkins. The original failure that caused me to add it was removed from
jenkins. This will either fix the test or reveal the other error that
needs to be fixed.
 2018-07-12 11:14:47 -07:00
rallytime
8bc71688ea
Remove /sr.* pattern from test 
/sr.* pattern should raise exception
 2018-07-12 11:24:44 -04:00
rallytime
5e2e2a63fa
Update file unit tests to handle "writelines" change 
Since file.line is now using "writelines()" instead of "write()", we
need to handle the unittests accordingly.
 2018-07-12 11:12:22 -04:00