Shane Lee
|
c6f3da5ed5
|
Merge branch '2019.2.1' into fix_setup_2019.2.1
|
2019-07-05 08:57:55 -06:00 |
|
Shane Lee
|
fae9f1a359
|
Merge branch '2019.2.1' into fix_win_dism_2019.2.1
|
2019-07-05 08:54:52 -06:00 |
|
Megan Wilhite
|
b5e2b0b6c8
|
Merge branch '2019.2.1' into pytest_5_changes
|
2019-07-03 09:33:11 -04:00 |
|
Shane Lee
|
023c47d0fc
|
Fix typo
|
2019-07-03 06:50:54 -06:00 |
|
Shane Lee
|
62450db373
|
Merge branch '2019.2.1' into fix_lock_1740_lgpo
|
2019-07-02 22:43:03 -06:00 |
|
twangboy
|
b71b655bdb
|
Merge forward #52065
|
2019-07-02 18:38:08 -06:00 |
|
twangboy
|
43dd7b325e
|
Merge Forward #52593
|
2019-07-02 18:28:03 -06:00 |
|
Shane Lee
|
7b05bf825a
|
Merge branch '2019.2.1' into fix_lock_1688_lgpo
|
2019-07-02 17:46:47 -06:00 |
|
Megan Wilhite
|
c2befe2f24
|
Merge pull request #53614 from Ch3LL/mac_flaky
Increase flaky attempts on mac tests using systemsetup
|
2019-07-02 17:33:55 -04:00 |
|
Megan Wilhite
|
02461cbe8b
|
Merge pull request #53624 from Ch3LL/nodegroup_group_list
Allow yaml list notation for nodegroup expansion
|
2019-07-02 17:32:42 -04:00 |
|
twangboy
|
f6276a3d5d
|
Fix compare issue in lgpo state module
Compare dicts to dicts and lists to lists
Return False otherwise
Add some tests
|
2019-07-02 13:09:27 -06:00 |
|
Ch3LL
|
110b953dcc
|
Pytest 5.0 contextmanager str: call value on ExceptionInfo objects
|
2019-07-02 14:41:50 -04:00 |
|
twangboy
|
f6d00845bb
|
Add some unit tests, raise error on non-string types
|
2019-07-02 10:43:47 -06:00 |
|
Megan Wilhite
|
475d904fb9
|
Merge branch '2019.2.1' into nodegroup_group_list
|
2019-07-01 12:46:06 -04:00 |
|
Megan Wilhite
|
5460031d7d
|
Merge branch '2019.2.1' into mac_flaky
|
2019-07-01 12:45:56 -04:00 |
|
Gareth J. Greenaway
|
315eb3562f
|
Merge branch '2019.2.1' into do_key_test
|
2019-07-01 09:39:45 -07:00 |
|
David Murphy
|
34e38d7549
|
Merge branch '2019.2.1' into cherry-pick-pr-53370
|
2019-06-28 09:05:47 -06:00 |
|
Daniel Wozniak
|
14efced3f0
|
Merge pull request #53295 from DSRCorporation/bugs/test_file_recurse_set
Recurse kwarg of state.directory state shall be a list or None
|
2019-06-27 16:20:09 -07:00 |
|
Ch3LL
|
fbb15cdcfb
|
Add nodegroup list test
|
2019-06-27 13:42:02 -04:00 |
|
David Murphy
|
95b18190af
|
Initial working tests for gpg fixes and import keys, signing
(adjusted cherry picked from commit 2fd4c32679)
|
2019-06-27 11:23:18 -06:00 |
|
Daniel A. Wozniak
|
a74580be13
|
Clean up cruft
|
2019-06-27 17:16:36 +00:00 |
|
Daniel A. Wozniak
|
68958f5b68
|
Do not create duplicate minion ids
|
2019-06-27 17:16:35 +00:00 |
|
Daniel A. Wozniak
|
c47eeb463e
|
Add amazon 2 to PR tests
|
2019-06-27 17:16:35 +00:00 |
|
Daniel A. Wozniak
|
dc90b47ad2
|
More robust beacon state test
|
2019-06-27 17:16:33 +00:00 |
|
Megan Wilhite
|
ee59d3947f
|
Merge branch '2019.2.1' into nodegroup_group_list
|
2019-06-27 11:54:59 -04:00 |
|
Ch3LL
|
d236bd4fea
|
Allow yaml list notation for nodegroup expansion
|
2019-06-27 11:10:29 -04:00 |
|
Ch3LL
|
7dcaaf0118
|
Increase flaky attempts on mac tests using systemsetup
|
2019-06-26 13:22:10 -04:00 |
|
Shane Lee
|
571d82a128
|
Merge branch '2019.2.1' into bugs/test_file_recurse_set
|
2019-06-25 10:07:06 -06:00 |
|
Daniel A. Wozniak
|
e9b61dc4db
|
Add unit tests for recent SaltCacheLoader changes
|
2019-06-24 18:22:15 +00:00 |
|
Ch3LL
|
128ba07f95
|
Move create key call into try/except in Digital Ocean key test
|
2019-06-21 14:47:56 -04:00 |
|
Gareth J. Greenaway
|
1974f110bc
|
Disabling a couple more tests in integration.modules.test_cp that hang on OS X and Py2.
|
2019-06-20 11:58:24 -07:00 |
|
Gareth J. Greenaway
|
7721151a12
|
Fixing lint.
|
2019-06-20 07:04:21 -07:00 |
|
Gareth J. Greenaway
|
1d4e228f15
|
Updating various skips for tests to only skip if OS is OS X and Python is Python2.
|
2019-06-20 07:04:21 -07:00 |
|
Gareth J. Greenaway
|
01dafdc6fc
|
Skipping integration.modules.test_cp.CPModuleTest.test_get_file_str_https on OS X
|
2019-06-20 07:04:21 -07:00 |
|
Gareth J. Greenaway
|
c02db20cb1
|
Disabling integration.modules.test_state.StateModuleTest.test_parallel_state_with_long_tag
|
2019-06-20 07:04:21 -07:00 |
|
Gareth J. Greenaway
|
87888778fe
|
Skip integration.states.test_file.FileTest.test_issue_11003_immutable_lazy_proxy_sum and
integration.states.test_pip_state.PipStateTest.test_22359_pip_installed_unless_does_not_trigger_warnings when running on OS X.
|
2019-06-20 07:04:21 -07:00 |
|
Gareth J. Greenaway
|
cf76027a43
|
Removing wrong import of skipIf
|
2019-06-20 07:04:20 -07:00 |
|
Gareth J. Greenaway
|
b10e1e7c58
|
Moving the skipIf for OS X from the beacon state tests to the renderer state tests.
|
2019-06-20 07:04:20 -07:00 |
|
Gareth J. Greenaway
|
d2fef9ac3f
|
Disabling beacon state tests on OS X for the time being.
|
2019-06-20 07:04:20 -07:00 |
|
Gareth J. Greenaway
|
1741bb053b
|
Adding some timeouts to see if it helps the tests pass on OS X.
|
2019-06-20 07:04:20 -07:00 |
|
Gareth J. Greenaway
|
fd0ba0aea9
|
Ensure the user and group used by @with_system_user_and_group are consistent.
|
2019-06-20 07:04:20 -07:00 |
|
Gareth J. Greenaway
|
e03ab81b99
|
Using salt.utils.path.which to find false, on OSX it lives under /usr/bin/
|
2019-06-20 07:04:20 -07:00 |
|
Gareth J. Greenaway
|
8440176992
|
Fixing a log issue that pops up after test_gen_thin_compression_fallback_py3 on "OS X, need to ensure that salt.utils.thin.os.close is mocked.
|
2019-06-20 07:04:19 -07:00 |
|
Megan Wilhite
|
f27c434029
|
Merge branch '2019.2.1' into cp-52787
|
2019-06-19 14:54:14 -04:00 |
|
Daniel Wozniak
|
fd6cb35093
|
Merge pull request #53467 from twangboy/fix_test_win_file
Check valid username first (fixes failing symlink test)
|
2019-06-19 10:04:29 -07:00 |
|
Megan Wilhite
|
bdd7c2c571
|
Merge pull request #53491 from Ch3LL/crypt_test_mac
Update test_gen_hash for macosx
|
2019-06-19 09:16:02 -04:00 |
|
Megan Wilhite
|
1bbdc7f6b2
|
Merge branch '2019.2.1' into cp-52787
|
2019-06-18 16:53:57 -04:00 |
|
Megan Wilhite
|
700338ea30
|
Merge branch '2019.2.1' into crypt_test_mac
|
2019-06-18 16:53:48 -04:00 |
|
Megan Wilhite
|
64a3e8d5d5
|
Merge branch '2019.2.1' into do_cloud_test
|
2019-06-18 16:53:44 -04:00 |
|
Shane Lee
|
6a21edb2c1
|
Merge branch '2019.2.1' into fix_test_win_file
|
2019-06-18 14:49:25 -06:00 |
|