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
101,828 Commits 24 Branches 182 Tags 341 MiB
05cd93fcfd
Commit Graph

16098 Commits

Author SHA1 Message Date
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
Daniel A. Wozniak
aff15d4c04 Fix linter wart 2019-06-20 18:40:42 +00:00
Daniel A. Wozniak
9606db79fc Comment the tcp message client test better 2019-06-20 18:31:13 +00:00
Daniel A. Wozniak
dcf576f4c9 Add unit test for tcp message client close method 2019-06-20 18:24:53 +00: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
Ch3LL
8c8f0ac0e4
import six runtests log handler 2019-06-18 09:55:44 -04:00
Ch3LL
f442b338b1
Revert "Enable logging for test runs on py3" 
This reverts commit 9339425dba.
 2019-06-18 09:51:50 -04:00
twangboy
31ce1fb0fe
Fix some lint, skip some tests 2019-06-17 15:56:49 -06:00
twangboy
6de4db6b1c
Monkeypatch in the class instead of globally 2019-06-17 15:02:07 -06:00
twangboy
d663a1f8ee
Fix the failing BlockReplace test cases on Windows 
Many of the functions from the `filemod` module are "namespaced" into
the `win_file` module. That's the file module that gets used on Windows,
so we need to make sure the `check_perms` function from the `win_file`
module is used on Windows.
 2019-06-17 15:02:07 -06:00
twangboy
299f88f78e
Update test_managed_contents 2019-06-17 15:02:07 -06:00
twangboy
81110e55ce
Fix test_file_copy_make_dirs that was failing on Linux 
I wasn't running sudo, but now it tells you that
And verifies that the user is added and the state is run successfully
before continuing with the test
 2019-06-17 15:02:07 -06:00
twangboy
4a9c020787
Fix issues with win_runas 
modules/file.py:     Pass the right parameters to `check_perms` on Windows
platform/win.py:     Return actual error on runas failure
platform/win.py:     Setup environment for CreateProcessWithLogonW
states/file.py:      Pass the right parameters to `file.check_perms` on
                     Windows
states/zfs.py:       Fix __virtual__ so it doesn't stacktrace in Windows
                     logs
states/zpool.py:     Fix __virtual__ so it doesn't stacktrace in Windows
                     logs
utils/win_runas.py:  Cleanup the handles a little better by using some
                     try/finally blocks.
states/test_file.py: Just use os.mkdir on Windows as the mode is ignored
 2019-06-17 15:02:06 -06:00
Megan Wilhite
458fe9f346
Merge branch '2019.2.1' into cp-52787 2019-06-17 11:59:47 -04:00
Wayne Werner
33b45d2699
Merge branch '2019.2.1' into 2019.2.1 2019-06-17 10:21:24 -05:00
Daniel Wozniak
775b8c2664
Merge branch '2019.2.1' into crypt_test_mac 2019-06-14 14:22:16 -07:00
Daniel Wozniak
45c0c43690
Merge branch '2019.2.1' into do_cloud_test 2019-06-14 14:22:01 -07:00
Daniel Wozniak
a8d817489f
Merge branch '2019.2.1' into fix-chattr-problems 2019-06-14 14:14:12 -07:00
Ch3LL
3826c568aa
Allows delete digital ocean key for test_key_management test 2019-06-14 16:25:37 -04:00
Daniel A. Wozniak
17c983b27b
Fix linter 2019-06-14 19:18:38 +00:00
Daniel A. Wozniak
9339425dba
Enable logging for test runs on py3 2019-06-14 19:13:34 +00:00
Daniel A. Wozniak
f1b65d1e26
Fix syndic connection when using tcp transport 2019-06-14 19:13:34 +00:00
Ch3LL
0832b49f2b
Update test_gen_hash for macosx 2019-06-14 14:04:43 -04:00
Wayne Werner
62e590beae
Update file.chattr 
- Better test coverage
- Only return supported attributes from lsattr
- Update how changes are reported
 2019-06-12 10:26:52 -05:00
twangboy
8c30dbdb02
Add priv info to error message 2019-06-11 17:48:25 -06:00
twangboy
a7d41a85a7
Make them non-destructive tests 2019-06-11 13:45:41 -06:00
twangboy
d8bede07df
Remove duplicate test 2019-06-11 13:45:41 -06:00
twangboy
89aaf2edbc
Remove duplicate test 2019-06-11 13:45:40 -06:00
twangboy
184ec4a2c2
Skip test on linux 2019-06-11 13:45:40 -06:00
twangboy
c97ea995a8
Mark it a destructive test 2019-06-11 13:45:40 -06:00
twangboy
9da7090907
Fix failing symlink test 2019-06-11 13:45:40 -06:00
Gareth J. Greenaway
ab9fe465fd
Merge pull request #53165 from Ch3LL/ami_window_cloud 
Update ami's used for windows cloud tests
 2019-06-11 08:54:40 -07:00
Akmod
dfb62779c6
Cherry-picked file-stat commit (#53430) 2019-06-10 15:32:26 -06:00
Megan Wilhite
1d0b0a6ad3
Merge branch '2019.2.1' into ami_window_cloud 2019-06-10 10:55:54 -04:00
Gareth J. Greenaway
b970bde545
Merge branch '2019.2.1' into cp-52787 2019-06-07 09:29:26 -07:00
Akmod
477cd20cd4
Check dir_mode recursively in file.directory (#53385) 
* Created a test case

* Fix states.file checking directory permissions recursively

A change was introduced in 79f6b426ff (PR #50653) to check the file
mode recursively. This change introduced a variable shadow that
caused directory permission checking to fail.

* Rename mode variable to dir_mode for clarity

* Revert "Created a test case"

This reverts commit 26fd01aa9382027415883e79c133b168a9a57cb3.

* Re-added test case without irrelevant cosmetic code changes

* Send string instead of integer - normalize values before comparison
 2019-06-06 17:11:00 -06:00
David Murphy
b84833de45
Merge branch '2019.2.1' into fix_53274 2019-06-03 09:28:06 -06:00
David Murphy
7085f36764 Fixed pylint issue on PR not showing when run pylint locally 2019-05-31 18:03:00 -06:00
David Murphy
1200031263 Updated to use package bash-doc if Amazon Linux 1 after review comments 2019-05-31 17:17:11 -06:00
David Murphy
b2a4a5e63f Fix for issue #53274, test on Amazon Linux 1 2019-05-31 17:05:59 -06:00
Gareth J. Greenaway
03eacac94c
Merge branch '2019.2.1' into test_kubernetes_lint_failures_silenced 2019-05-31 13:49:21 -07:00
cmcmarrow
f93e7d34c7
stops pylint E1120 from showing 2019-05-31 17:54:51 +00:00
cmcmarrow
cbe6423a11
stops pylint E1120 from showing 2019-05-31 17:30:52 +00:00
Megan Wilhite
0f9077b5dc
Merge branch '2019.2.1' into cp-52787 2019-05-30 11:47:00 -04:00
Megan Wilhite
a77a05cccb
Merge branch '2019.2.1' into ami_window_cloud 2019-05-30 11:45:15 -04:00
Dmitry Kuzmenko
013e04ca6e
Recurse kwarg of state.directory state shall be a list of None 2019-05-29 14:44:02 +03:00
cmcmarrow
c5a5d43619
test_kubernetes_lint_failures_silenced 2019-05-28 22:40:59 +00:00
cmcmarrow
b8383956d4
test_kubernetes_lint_failures_silenced 2019-05-28 22:35:10 +00:00
cmcmarrow
997d0a814d
stops pylint E1120 from showing 2019-05-28 21:36:19 +00:00
Megan Wilhite
acabb70238
Merge branch '2019.2.1' into 2019.2.1 2019-05-28 15:28:51 -04:00
Megan Wilhite
a7afd311f6
Merge pull request #53138 from frogunder/fix_vultr_cloudtest 
vultr cloudtest fix
 2019-05-28 10:34:21 -04:00
Megan Wilhite
9d21b75c73
Merge branch '2019.2.1' into cp-52787 2019-05-28 09:48:51 -04:00
Megan Wilhite
a1204dc325
Merge branch '2019.2.1' into ami_window_cloud 2019-05-28 09:44:06 -04:00
Pedro Algarvio
912b9b3c22
Add the missing, and required, top pillar file. 2019-05-28 11:16:34 +01:00
Pedro Algarvio
d47222ce1e
Salt no longer maintains the blackout pillar in VCS 2019-05-27 22:11:15 +01:00
Pedro Algarvio
ad01dd2a2b
More robust minion blackout tests 2019-05-27 19:05:47 +01:00
Pedro Algarvio
a0346d18bf
Try harder to get the minion grains 2019-05-27 19:05:26 +01:00
Pedro Algarvio
36717bddd7
Try and address the test flakyness 2019-05-27 19:05:21 +01:00
Pedro Algarvio
ce07d8c947
Add more information when the assertion fails 2019-05-27 19:05:15 +01:00
Daniel A. Wozniak
b99e914e05
Attempt to fix mine tests 2019-05-27 19:04:34 +01:00
Pedro Algarvio
fca981c909
One more known to return None 2019-05-27 19:02:43 +01:00
Pedro Algarvio
951df4882e
One more known to return None 2019-05-27 19:02:39 +01:00
Pedro Algarvio
eb5fd3ece2
Fix integration.modules.test_mine.MineTest.test_get for sub_minion 
Since the `sub_minion` does not have `mine_functions` defined,
`mine.update` returns `None` as opposed to `True` when `mine_functions`
are defined.
 2019-05-27 19:02:33 +01:00
Pedro Algarvio
cefdd907c1
Stop error messages about missing roster file on syndic master 2019-05-27 11:46:31 +01:00
Pedro Algarvio
6bf8f46df3
Don't complain when attempting to close sockets at this stage 2019-05-27 11:45:26 +01:00
Megan Wilhite
d15c8f2db1
Merge branch '2019.2.1' into ami_window_cloud 2019-05-23 13:22:39 -04:00
Gareth J. Greenaway
6c452b3f4c
removing unwanted commits from this branch 
Conflicts:
  - salt/states/pip_state.py
  - tests/support/helpers.py
 2019-05-23 12:13:30 -04:00
Gareth J. Greenaway
e0b0ba8c71
Handling in flaky when maximum number of attempts raised and the exception should be raised. Different approaches depending on Py2 vs Py3. 
Conflicts:
  - tests/support/helpers.py
 2019-05-23 11:49:46 -04:00
Gareth J. Greenaway
434dcdaae1
Disabling two tests when using Python 3 and OS X 
Conflicts:
 - tests/integration/modules/test_state.py
 2019-05-23 11:47:49 -04:00
Gareth J. Greenaway
5784e80ca7
Disabling integration.shell.test_minion.MinionTest.test_issue_7754 test on OS X because it hangs the test suite. 2019-05-23 11:46:07 -04:00
Gareth J. Greenaway
78aeb61f67
Dropping the version check for InstallationError down to anything 1.0 or greater. Removing the test that simulates versions of pip below 1.0. 2019-05-23 11:45:58 -04:00
Gareth J. Greenaway
4ec90c2d39
Adding an jinja if statement to only the python parameter if the result from get_python_executable is a valid value. Maintaining backwards compatibilty to run tests without Nox. 2019-05-23 11:44:42 -04:00
twangboy
758d020c08
Skip test on Windows 2019-05-22 16:54:23 -06:00
Ch3LL
941778fdf8
Update ami's used for windows cloud tests 2019-05-22 12:09:42 -04:00
Megan Wilhite
16ef3d2093
Merge branch '2019.2.1' into shadow_fed_fix 2019-05-21 15:27:26 -04:00
Megan Wilhite
85e9b2f067
Merge pull request #53073 from Ch3LL/ssh_py3_log 
salt-ssh: python binary exists before version check
 2019-05-20 18:36:33 -04:00
Ch3LL
09ff8679b9
Check for all non-word when calling secure_password 2019-05-20 18:10:19 -04:00
Frode
9f4550caa2
vultr cloudtest fix 2019-05-20 21:04:20 +00:00
Gareth J. Greenaway
5f6581a228
Merge branch '2019.2.1' into yaml_flow_style 2019-05-16 12:42:14 -07:00
Ch3LL
383e781be8
Improve logging in salt-ssh gen_thin 2019-05-16 11:38:28 -04:00
Ch3LL
43714342d4
salt-ssh: python binary exists before version check 2019-05-16 11:22:27 -04:00
Gareth J. Greenaway
13e5e5524c
The maximum for the multiprocessing queue on MacOS is 32767, so if we running on MacOS then we use that maximum. 
Conflicts:
  - salt/log/setup.py
 2019-05-16 11:10:46 -04:00
Pedro Algarvio
06fa91bd33
Merge pull request #52972 from garethgreenaway/52817_unit_modules_test_telegram_telegrammoduletest_test_post_message 
[2019.2.1] Fix to unit.modules.test_telegram
 2019-05-15 08:50:12 +01:00
Gareth J. Greenaway
cea7131cf1
Removing global declaration. 2019-05-14 17:48:05 -07:00
Ch3LL
0a213ee046
Change package name for suse pkg tests 2019-05-14 14:38:40 -04:00
Shane Lee
21838a1f2c
Merge branch '2019.2.1' into fix_test_pip_state 2019-05-13 14:33:34 -06:00
Ch3LL
368c012f12
Revert "Make sure --run-expensive runtests.py arg works" 
This reverts commit 56bf069079.
 2019-05-13 14:45:12 -04:00
Gareth J. Greenaway
5bf9a95267
Fixing lint. 2019-05-10 16:36:41 -07:00
twangboy
351d415b69
Return path to Python instead of None 2019-05-10 17:21:56 -06:00
Gareth J. Greenaway
4d3c46d193
fixing broken unit.modules.test_telegram test. 2019-05-10 16:21:07 -07:00
Megan Wilhite
9a27fb3f96
Merge branch '2019.2.1' into yaml_flow_style 2019-05-10 14:54:33 -04:00
Ch3LL
0d0e354627
Fix yamldumper test for both py2/py3 2019-05-10 14:52:58 -04:00
Shane Lee
ac27e6970f
Merge branch '2019.2.1' into fix_test_file 2019-05-09 14:34:14 -06:00
Ch3LL
20bc954483
Update docs for yamldumper test 2019-05-09 15:42:52 -04:00
Megan Wilhite
bf648e57a8
Update tests/unit/utils/test_yamldumper.py 
Co-Authored-By: Wayne Werner <waynejwerner@gmail.com>
 2019-05-09 15:39:12 -04:00
Ch3LL
70d578a1af
Set default_flow_style=None in yaml.dump calls 2019-05-09 15:18:32 -04:00
Daniel Wozniak
4437764891
Merge pull request #52943 from Ch3LL/fix_elastisearch 
Fix elasticsearch state module: allow user to define empty aliases
 2019-05-09 08:46:37 -07:00
Pedro Algarvio
a06d7cef0e
We need to call the decorator 2019-05-09 15:17:24 +01:00
Pedro Algarvio
77185af841
Partial revert since this is a class method 2019-05-09 14:41:43 +01:00
Pedro Algarvio
f5c5771dd9
Lint fixes 2019-05-09 14:40:17 +01:00
Pedro Algarvio
8e505fb91a
Move tests to existing test modules 2019-05-09 14:20:23 +01:00
Pedro Algarvio
46816092eb
tests/unit/config/__init__.py -> tests/unit/config/test_config.py 
No top level `__init__.py` should contain tests
 2019-05-09 14:19:56 +01:00
Pedro Algarvio
33743fc4a0
Don't traceback when trying to close a closed socket 2019-05-09 14:14:34 +01:00
Pedro Algarvio
da2e147e54
Always cleanup the changed environ 2019-05-09 14:13:32 +01:00
Pedro Algarvio
087c74d907
No globals in tests, specially dictionaries! 2019-05-09 14:11:12 +01:00
Daniel A. Wozniak
5bb7869adc
fix linter 2019-05-09 14:03:05 +01:00
Megan Wilhite
451fb7e60f
Merge branch '2019.2.1' into fix_elastisearch 2019-05-08 16:15:41 -04:00
Ch3LL
ebff9b94e0
Fix elasticsearch state module: allow user to define empty aliases 2019-05-08 15:50:35 -04:00
Pedro Algarvio
a8f7b464f5
Test is not destructive. 
Changes salt's testing config, which is what testing is all about, but
does not change the underlying OS.
 2019-05-08 19:46:30 +01:00
Pedro Algarvio
62574ee197
Typo 2019-05-08 13:16:52 +01:00
Pedro Algarvio
e9f6a1228d
identical_signature_wrapper adds __wrapped__ to function globals 2019-05-08 13:16:51 +01:00
Daniel A. Wozniak
6e0b61baa9
Less flaky mine tests 2019-05-08 13:16:51 +01:00
Daniel A. Wozniak
3709ed745e
msgpack returns string_types 2019-05-08 13:16:51 +01:00
Daniel A. Wozniak
a36b15e449
Add regression test 2019-05-08 13:16:51 +01:00
Daniel A. Wozniak
8fdb04df0d
SIGKILL is not alwasy available use a local variable 2019-05-08 13:16:50 +01:00
Daniel A. Wozniak
4d6b8da5a0
Fix linter 2019-05-08 13:16:50 +01:00
Daniel A. Wozniak
759bccc202
Fix test_doc on windows by using grep yay! 2019-05-08 13:16:49 +01:00
Daniel A. Wozniak
0ce086d13d
Fix remaining failures on ubuntu 1404 and add to PR tests 2019-05-08 13:16:49 +01:00
Daniel A. Wozniak
b0aa28760c
Fix missing class wart 2019-05-08 13:16:49 +01:00
Daniel A. Wozniak
21ecb742db
fix linter 2019-05-08 13:16:49 +01:00
Daniel A. Wozniak
62c0f9fdd9
Skip tests when no libcloud 2019-05-08 13:16:48 +01:00
Daniel A. Wozniak
1d92290304
Fix unused import 2019-05-08 13:16:48 +01:00
Daniel A. Wozniak
238fd0f071
Fix broken pip state 2019-05-08 13:16:48 +01:00
Daniel A. Wozniak
1eea9908e9
Fix linter 2019-05-08 13:16:47 +01:00
Daniel A. Wozniak
52ca668360
Skip tests when no libcloud 2019-05-08 13:16:47 +01:00
Daniel A. Wozniak
522599d261
Dont fail just because some random process died 2019-05-08 13:16:47 +01:00
Daniel A. Wozniak
34cef86e14
Ignore super not called 2019-05-08 13:16:46 +01:00
Daniel A. Wozniak
b7ace9c929
Fix linter 2019-05-08 13:16:46 +01:00
Daniel A. Wozniak
aceb6d3013
Skip libcloud unit tests when no libcloud 2019-05-08 13:16:46 +01:00
Ch3LL
2acb0f37bc
Make sure --run-expensive runtests.py arg works 2019-05-08 13:16:45 +01:00
twangboy
12d8d351cf
Stop w32time before and start after testing 2019-05-08 13:16:45 +01:00
twangboy
7f1c22ce3a
Skip tests that fail on Windows 2019-05-08 13:16:45 +01:00