Commit Graph

8531 Commits

Author SHA1 Message Date
Gareth J. Greenaway
3661ee071a
Adding test=True to artifactory.download. 2018-11-19 16:42:11 -08:00
Gareth J. Greenaway
db89b27ff2
Merge branch '2018.3' into 50542_mysql_ensure_verify_login_uses_connection_host 2018-11-19 15:22:57 -08:00
Gareth J. Greenaway
0284323d50
Ensure that verify_login is using the host from the connection_args and not the host associated with the user. Adding a test to ensure user_exists when the passed host is the MySQL wildcard %. 2018-11-16 14:01:31 -08:00
Daniel A. Wozniak
39e811b296
Add issue url to tests 2018-11-15 12:02:58 -07:00
Gareth J. Greenaway
4f30611c69
lint 2018-11-15 10:31:30 -08:00
Gareth J. Greenaway
4f9eb95d7f
Fixing a typo in the _virtual function, should be checking for existing grains in osdata not grains. Updating the detection to look for /sys/bus/xen/drivers/xenconsole instead of specifically looking for any files under /sys/bus/xen/drivers. Some systems that are not running as Xen PV hosts include files under that location, particular Oracle Linux. 2018-11-15 10:31:30 -08:00
bornwitbugs
e59ced6507
Merge branch '2018.3' of github.com:saltstack/salt into load_beacon_fix 2018-11-14 17:54:37 +00:00
Nicole Thomas
6b272c1d65
Merge pull request #50492 from rallytime/bp-50228-and-50443
Back-port #50228 and #50443 to 2018.3
2018-11-13 11:59:14 -05:00
rallytime
f578392eb4
Lint Fix: add mock_open import 2018-11-13 09:30:02 -05:00
Shea Craig
3c36bddd8a
Fix linting errors. 2018-11-13 09:22:24 -05:00
Shea Craig
fab57de795
Write tests to handle invalid launchd plist XML. 2018-11-13 09:21:58 -05:00
Shea Craig
bb429b0dff
Condense service result assertions, add a binary plist test. 2018-11-13 09:21:58 -05:00
Shea Craig
a809fef417
Factor out another helper function, implement broken symlink test. 2018-11-13 09:21:58 -05:00
Shea Craig
216f7ef864
Update testing for mac_utils services.
This commit begins to go over the existing testing for mac_utils,
applying the updated best-practices from the unit testing section of the
Salt docs.

Wherever possible, I've tried to keep the data for each test within the
test, while factoring out repetitive functions. In this commit, for
example, the `os.walk` side_effect func has been factored into its own
helper function.

This commit begins looking at what is being tested for this module and
making it more specific, specifically to test one thing per test
(existing tests had multiple asserts and in some casaes were actually
malformed such that the tests would pass, but in actual use, code would
throw an exception and skip over the block).
2018-11-13 09:21:57 -05:00
Shea Craig
ae6f49b0b1
Make test correctly generate a double exception. 2018-11-13 09:11:18 -05:00
Daniel Wozniak
7dd34386ef
Merge pull request #50456 from terminalmage/issue50218
Two bugfixes
2018-11-12 23:06:51 -07:00
Erik Johnson
0f02da7fec
Remove unnecessary u prefix from string literals
These are redundant with unicode_literals being used
2018-11-12 16:45:28 -05:00
Erik Johnson
fc26ae8ea3
Add unit test for comparing containers with the same env vars 2018-11-12 16:45:22 -05:00
Erik Johnson
6143408507
Add unit test for TimedProc regression 2018-11-12 09:08:49 -06:00
Daniel A. Wozniak
4f81432321
Set subscribe via sockopt for better compatibility 2018-11-11 02:17:45 -07:00
Daniel A. Wozniak
6882209e3b
More reliable pub server publishing
- Uses existing zmq context
- Store socket in thread local storage for re-use
- Add tests to verify publish reliability
2018-11-11 00:58:47 -07:00
bornwitbugs
d07c84d7ad
reordering ret dictionary in load test to ascending order 2018-11-11 03:47:12 +00:00
Gareth J. Greenaway
469c090330
Adding a check to see if the config file exists, if not then return an empty list so we get the would be changes. Adding a test for this functionality. 2018-11-07 15:50:17 -08:00
Gareth J. Greenaway
039f3d1622
Increase limit for trimming. 2018-11-05 11:22:20 -08:00
Gareth J. Greenaway
7f77bfef99
Adding test for utils/dicttrim.py 2018-11-05 10:58:36 -08:00
Jerzy Drozdz
110f74f3ba Added unit tests reproducing issue 2018-11-02 23:01:43 +01:00
Gareth J. Greenaway
b8ded8bf5f
Updating the swap function in the mount.swap function also check the device name when checking the fstab data. Updating tests to reflect new behavior. 2018-11-02 12:23:24 -07:00
Antonio Jordan
f7041285d5
fixing type in load beacon module and adding option validators to config check function along with mock default values in test, fixes #48343 2018-11-02 18:52:12 +00:00
Antonio Jordan
4114a4f5d8
fixing type in load beacon module and adding option validators to config check function along with mock default values in test 2018-11-02 18:22:55 +00:00
Anthony Shaw
529687a855
update test assertions 2018-11-01 08:41:53 +11:00
Anthony Shaw
ba526ad149
remove unused import 2018-10-30 14:38:22 -04:00
Anthony Shaw
220e57f848
create 2 simple unit tests for the netyang state module and fix issue in #47425 2018-10-30 14:38:22 -04:00
Anthony Shaw
20bf3067b9
reproduce bug in 47425 2018-10-30 14:38:22 -04:00
Daniel Wallace
fb43061cb1
fix test 2018-10-29 14:45:23 -05:00
Daniel Wallace
5eb0e37f4e
add extra space to localemod test 2018-10-29 14:31:36 -05:00
Nicole Thomas
0f1dc08d41
Merge pull request #50282 from twangboy/fix_test_diskusage
Fix `unit.beacons.test_diskusage` on Windows
2018-10-29 14:37:12 -04:00
twangboy
fd369dd115
Mock is_windows = False 2018-10-29 10:25:56 -06:00
Nicole Thomas
f7c2f04574
Merge pull request #50182 from terminalmage/issue50050
Backport runtests.py modifications from develop to 2018.3
2018-10-29 12:25:06 -04:00
rallytime
113d76e045
Revert "Move jinja templating tests alongside salt/utils/jinja.py's tests"
This reverts commit 6d9c2eb6b0.
2018-10-29 11:05:33 -04:00
rallytime
8968f9d164
Revert "Rename test_map_conf test file to respect naming convention"
This reverts commit 8326a09921.
2018-10-29 10:46:29 -04:00
rallytime
85a9395c2a
Remove saltclass pillar unit test for list expansion
This test only applies to functionality present in Fluorine or newer.

This commit will need to be reverted again in the fluorine branch.
2018-10-29 10:34:24 -04:00
rallytime
3d95673be0
Use get_config_dir() instead of self.config_dir
This attribute does not exist in the 2018.3 branch. Use the function
for now, and then change this back on the merge-forward.
2018-10-29 10:23:00 -04:00
rallytime
e8b3a62b31
Add init file back in for unit/client pkg
This file was accidentally removed during some test renaming. The absence
of this file prevents the test from running due to an ImportError.
2018-10-29 10:19:52 -04:00
Cédric Bosdonnat
d527dd29cc
Rename states/test_libvirt.py into states/test_virt.py
Modules test files are named after the module itself, the state virt
module needs to comply with that rule too.
2018-10-26 16:05:03 -04:00
rallytime
ab4a670ff2
Remove pgjsonb returner unit tests
The tests that are written in this file are for functions not present
in the 2018.3 branch.

This commit will need to be reverted in the merge-forward to `fluorine`.
2018-10-26 15:58:46 -04:00
rallytime
dfa05b978e
Remove test files for beacons that don't exist in 2018.3 2018-10-25 11:16:11 -04:00
Nicole Thomas
9ad43f2b71
Merge pull request #50063 from twangboy/fix_50039
Use long when setting REG_QWORD
2018-10-25 09:45:02 -04:00
twangboy
84b8dd6856
Add tests 2018-10-24 11:49:01 -06:00
Gareth J. Greenaway
42b3203cf9
Fixing lint 2018-10-23 19:14:00 -07:00
Gareth J. Greenaway
f65fa57a10
Fixing a bug in the diskusage beacon that prevented it from working on Windows. Adding a couple tests to test functionality on Windows. 2018-10-23 19:03:19 -07:00
Erik Johnson
65fef9a7c0
Moar Lint 2018-10-23 14:48:31 -05:00
Erik Johnson
2ac939eace
Add test to check test module names and make sure they match the naming convention 2018-10-23 14:47:17 -05:00
Erik Johnson
662ca0de73
Rename files to match naming convention 2018-10-23 14:47:17 -05:00
Erik Johnson
186d333c92
Add back changes lost in cherry-pick 2018-10-23 14:46:05 -05:00
Erik Johnson
a2365317f2
Add back test accidentally deleted when cherry-picking 2018-10-23 14:46:05 -05:00
Erik Johnson
bfb6015428
Rename/consolidate salt.utils unit tests to conform to naming convention 2018-10-23 14:39:17 -05:00
Erik Johnson
84749dd854
Consolitdate and move salt-ssh unit tests to proper location 2018-10-23 14:33:43 -05:00
Erik Johnson
71825a596e
Consolidate and move loader tests to test/unit/test_loader.py 2018-10-23 14:31:08 -05:00
Erik Johnson
8326a09921
Rename test_map_conf test file to respect naming convention 2018-10-23 14:29:02 -05:00
Erik Johnson
6d9c2eb6b0
Move jinja templating tests alongside salt/utils/jinja.py's tests 2018-10-23 14:28:45 -05:00
Erik Johnson
330c21179a
Consolidate saltclass pillar unit tests into single module 2018-10-23 14:21:48 -05:00
Erik Johnson
a642619fa9
Rename test pgjsonb returner test file to match naming convention 2018-10-23 14:21:48 -05:00
m03
f5d6080237
Add test_to_none 2018-10-23 10:30:31 -04:00
Gareth J. Greenaway
8fa87e3dc9
Update test_network.py 2018-10-21 08:39:29 -07:00
Gareth J. Greenaway
311796994b
Fixing scenario where the interface for the default route has a dash in it, regular expression used in get_route currently doesn't not account for this.. Adding some additional tests for network.get_route. 2018-10-20 15:57:25 -07:00
Mike Place
de23c83f54
Merge pull request #50114 from rallytime/bp-50061
Back-port #50061 to 2018.3
2018-10-19 05:46:02 -06:00
Erik Johnson
91812ff510
Squelch spurious errors logged in unit tests
We are getting errors in the LazyLoader because certain functions are
not present in the LazyDict due to being left out of the whitelist.
These don't cause the tests to fail, but they do result in a lot of
spurious errors in the test suite.
2018-10-18 14:01:28 -05:00
Erik Johnson
1f09104b0d
Add unit test for pkg.install with epoch 2018-10-18 11:16:58 -04:00
Mike Place
f3fe4b67f7
Merge pull request #50064 from rallytime/bp-50022
Back-port #50022 to 2018.3
2018-10-16 11:09:46 +02:00
Brian Saville
40da3ce2d0
Make test check_pillar more lenient 2018-10-15 16:50:57 -04:00
Erik Johnson
f59506d4cc
Update tests to reflect behavior changes 2018-10-15 10:16:44 -05:00
Nicole Thomas
c912d3a288
Merge pull request #49946 from isbm/isbm-osversion_info-fixes
osversion/osversion_info/osmajorrelease grains fixes
2018-10-10 10:01:03 -04:00
Bo Maryniuk
a17ba35a5b Fix proper part name in the string-bound CPE 2018-10-09 16:37:15 +02:00
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