[2018.3] Merge forward from 2017.7 to 2018.3 #49055
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In Python 3 key sets of dicts no longer support indexing: `TypeError: 'dict_keys' object does not support indexing`
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.
This is a flaky test on Debian 8, so let's skip it for now.
Update expected return value in boto test
This uses the optimization_order config option to control which module is loaded when multiple optimization levels have been installed.
This prevents the loader from needlessly trying to process it (which will fail anyway since it's not a file).
The values that dictate this are module-level globals, so repeating this every time we refresh the file mapping is unnecessary.
Also, use USE_IMPORTLIB to gate testing on optimization_order, since this only works with Python 3.5+.
Properly handle optimized .pyc files in loader in PY3
The `test_grains_append_val_already_present` test can be flaky, especially on CentOS 7 when it gets bogged down. Let's give the test a little breathing room by adding a sleep so the grains.append calls don't stack up too quickly.
…or-test Skip test_jinja_deep_error on Debian 8
Add univention OS to debian os_family mapping
Make grains integration test more robust
No conflicts.
The fix in saltstack#49002 was incomplete and when run on Debian, it hits a `ValueError` when the RELEASE variable is a string with a decimal. This change fixes the error.
Fix test error in test_compiler jinja check
This change does 2 things: - Skip 2 tests: they are not actually _testing_ anything, just running functions Let's skip these for now until we can dedicate some time to investigate what should be tested here. This will also help the tests breath a little bit. - Add a small sleep to the async test. This test needs a little breathing room so the procs don't get stepped on. I think this is what is causing the master to shut down sometimes during test runs: ``` 08:41:47 test_wheel_async (integration.netapi.test_client.NetapiClientTest) 08:41:47 [CPU:0.0%|MEM:13.2%] ... 12:41:47,280 [salt.utils.process :670 ][ERROR ] An un-handled exception from the multiprocessing process 'SignalHandlingMultiprocessingProcess-24' was caught: 08:41:47 Traceback (most recent call last): 08:41:47 File "/tmp/kitchen/testing/salt/utils/process.py", line 663, in _run 08:41:47 return self._original_run() 08:41:47 File "/usr/lib/python3.5/multiprocessing/process.py", line 93, in run 08:41:47 self._target(*self._args, **self._kwargs) 08:41:47 File "/tmp/kitchen/testing/salt/client/mixins.py", line 457, in _proc_function 08:41:47 salt.utils.daemonize() 08:41:47 File "/tmp/kitchen/testing/salt/utils/__init__.py", line 514, in daemonize 08:41:47 os.dup2(dev_null.fileno(), sys.stdout.fileno()) 08:41:47 io.UnsupportedOperation: fileno 08:41:47 Process SignalHandlingMultiprocessingProcess-24: 08:41:47 Traceback (most recent call last): 08:41:47 File "/usr/lib/python3.5/multiprocessing/process.py", line 249, in _bootstrap 08:41:47 self.run() 08:41:47 File "/tmp/kitchen/testing/salt/utils/process.py", line 663, in _run 08:41:47 return self._original_run() 08:41:47 File "/usr/lib/python3.5/multiprocessing/process.py", line 93, in run 08:41:47 self._target(*self._args, **self._kwargs) 08:41:47 File "/tmp/kitchen/testing/salt/client/mixins.py", line 457, in _proc_function 08:41:47 salt.utils.daemonize() 08:41:47 File "/tmp/kitchen/testing/salt/utils/__init__.py", line 514, in daemonize 08:41:47 os.dup2(dev_null.fileno(), sys.stdout.fileno()) 08:41:47 io.UnsupportedOperation: fileno ```
[2017.7] Merge forward from 2017.7.8 to 2017.7
Update netapi client tests
Python 3 related fix in highstate_return.py
minor doc fix in netyang.py
[2017.7.8] backport PR saltstack#48212
Mark a jinja template test as flaky
…this out for the "OS" grain which is consistent.
…est_failing_py3_Debian_test [2017.7] Another fix to tests/integration/modules/test_service.py
increase timeout on vultr cloud integration test
No conflicts.
[2017.7] Merge forward from 2017.7.8 to 2017.7
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
gtmanfred
approved these changes
Aug 10, 2018
rallytime
force-pushed
the
merge-2018.3
branch
from
afdcdac
to
83a15cb
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Conflicts: