Gareth J. Greenaway
|
5f6581a228
|
Merge branch '2019.2.1' into yaml_flow_style
|
2019-05-16 12:42:14 -07:00 |
|
Shane Lee
|
f4103460a6
|
Merge pull request #53072 from Ch3LL/bp-52754-2019.2.1
Backport #52754 into 2019.2.1
|
2019-05-16 13:29:21 -06: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 |
|
Pedro Algarvio
|
d340cbca15
|
Merge pull request #53025 from Ch3LL/suse15_pkg_test
Change package name for suse pkg tests
|
2019-05-15 08:41:43 +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 |
|
Daniel Wozniak
|
c56fbb0f94
|
Merge pull request #53020 from Ch3LL/ssh_tops
Change ssh tops log message to debug
|
2019-05-14 09:56:41 -07:00 |
|
Megan Wilhite
|
cbbc76425a
|
Merge branch '2019.2.1' into ssh_tops
|
2019-05-14 11:40:53 -04:00 |
|
Ch3LL
|
c0538d29c9
|
Change ssh tops log message to debug
|
2019-05-14 11:12:37 -04:00 |
|
Shane Lee
|
ce099aaa46
|
Merge pull request #52973 from twangboy/fix_test_pip_state
Fix `integration.states.test_pip_state.PipStateTest.test_issue_2028_pip_installed_state` on Windows
|
2019-05-13 14:56:27 -06:00 |
|
Shane Lee
|
21838a1f2c
|
Merge branch '2019.2.1' into fix_test_pip_state
|
2019-05-13 14:33:34 -06:00 |
|
Pedro Algarvio
|
055d374e42
|
Merge pull request #52986 from Ch3LL/expensive_revert
Revert "Make sure --run-expensive runtests.py arg works"
|
2019-05-13 20:38:16 +01:00 |
|
Ch3LL
|
368c012f12
|
Revert "Make sure --run-expensive runtests.py arg works"
This reverts commit 56bf069079.
|
2019-05-13 14:45:12 -04:00 |
|
Shane Lee
|
cce263eed2
|
Merge branch '2019.2.1' into fix_test_pip_state
|
2019-05-13 11:32:51 -06:00 |
|
Megan Wilhite
|
e31718639e
|
Merge branch '2019.2.1' into yaml_flow_style
|
2019-05-13 09:52:26 -04:00 |
|
Pedro Algarvio
|
ee05da5951
|
Merge pull request #52968 from s0undt3ch/2019.2.1
[2019.2.1] Salt >= 2018.3.x supports Py3.7
|
2019-05-12 22:44:56 +01: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 |
|
Pedro Algarvio
|
73c37262a2
|
Salt >= 2018.3.x supports Py3.7
|
2019-05-10 20:41:54 +01:00 |
|
Shane Lee
|
cae51c2908
|
Merge pull request #52796 from Ch3LL/bp-50400
Backport #50400 and #50402 into 2019.2.1
|
2019-05-10 13:30:11 -06: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 |
|
Gareth J. Greenaway
|
0c2e3e7a2a
|
Merge branch '2019.2.1' into bp-50400
|
2019-05-10 08:43:56 -07:00 |
|
Shane Lee
|
20cccd85f1
|
Merge pull request #52770 from twangboy/fix_test_file
Fix test_file_managed_should_fall_back_to_binary on Windows
|
2019-05-09 14:35:01 -06: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
|
1268e3e59b
|
Merge branch '2019.2.1' into bp-50400
|
2019-05-09 16:40:52 +01:00 |
|
Pedro Algarvio
|
9b290b6258
|
Merge pull request #52952 from s0undt3ch/merge-forward/2018.3-to-2019.2.1-cherry
[2019.2.1] More nox changes and test fixes
|
2019-05-09 16:03:06 +01: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
|
3e43c87c44
|
Revert "fix compare_versions method"
This reverts commit 99f9e1c90a.
|
2019-05-09 14:30:24 +01:00 |
|
Pedro Algarvio
|
0e139bf1cb
|
Fix GOLDEN_IMAGES_CI_BRANCH value
|
2019-05-09 14:26:46 +01:00 |
|
Pedro Algarvio
|
12a94084fb
|
Add Py3.7 static requirements
|
2019-05-09 14:20:52 +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
|
b1dc7f651b
|
Pin to moto<=1.3.7 because of https://github.com/spulec/moto/pull/1952
No globally changing the environment on import, please.
|
2019-05-09 14:19:15 +01:00 |
|
Pedro Algarvio
|
0ffe7ca509
|
We no longer test againt Ubuntu 14.04 which reached EOL
|
2019-05-09 14:15:32 +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 Wozniak
|
a814fc071d
|
Fix underscore wart (and linter)
|
2019-05-09 14:06:35 +01:00 |
|
Erik Johnson
|
74b8f5f8aa
|
Fix deprecation warning in msgpack >= 0.5.2
This prevents a deprecation warning due to the "encoding" argument being
deprecated in version 0.5.2.
Conflicts:
* salt/payload.py
|
2019-05-09 14:05:19 +01:00 |
|
Pedro Algarvio
|
962b116874
|
Try to address dict changing during iteration
```
06:10:57 RuntimeError: dictionary changed size during iteration
06:10:57 Traceback (most recent call last):
06:10:57 File "/usr/lib64/python2.7/multiprocessing/queues.py", line 266, in _feed
06:10:57 send(obj)
06:10:57 RuntimeError: dictionary changed size during iteration
```
|
2019-05-09 14:04:07 +01:00 |
|
Daniel A. Wozniak
|
c58af57bc0
|
Tweak codeclimate settings for less noise
|
2019-05-09 14:03:53 +01:00 |
|