Commit Graph

86667 Commits

Author SHA1 Message Date
Daniel A. Wozniak
054afb8197
Multiple file state test fixes
- Account for hash differences due to line endings
- Ignore tests that are not valid on windows
- Other test fixes due to line endings
2018-08-13 12:29:25 -07:00
Nicole Thomas
af6ec1dce2
Merge pull request #49045 from twangboy/fix_43164
Fix docs for the registry module and state
2018-08-13 14:48:21 -04:00
Nicole Thomas
a840fea1a1
Merge pull request #49083 from rallytime/bootstrap-2017.7
[2017.7] Update bootstrap script to latest release
2018-08-13 14:12:43 -04:00
rallytime
358e14cdac
[2017.7] Update bootstrap script to latest release 2018-08-13 14:10:28 -04:00
Nicole Thomas
9db6cd5654
Merge pull request #49059 from twangboy/fix_37984
Fix docs for status.uptime on Windows
2018-08-10 17:30:38 -04:00
Nicole Thomas
f9db72f00c
Merge pull request #49061 from saltstack/revert-48982-new_logo_2017.7
Revert "New logo 2017.7 (WIP)"
2018-08-10 17:22:25 -04:00
Nicole Thomas
98a8da728b
Revert "New logo 2017.7 (WIP)" 2018-08-10 17:22:03 -04:00
twangboy
7ed45b5b00
Remove import 2018-08-10 14:41:19 -06:00
twangboy
7fb1edb469
Fix docs to clarify uptime output on Windows 2018-08-10 14:36:13 -06:00
Mike Place
bbcd1869ec
Merge pull request #48982 from newwebash/new_logo_2017.7
New logo 2017.7 (WIP)
2018-08-10 22:21:28 +02:00
twangboy
589456d08f
Fix lint errors 2018-08-10 12:50:01 -06:00
twangboy
e79243566d
Add rallytime's suggestions 2018-08-10 10:55:16 -06:00
twangboy
d1ae6b3d6d
Fix docs for the registry module and state
Addresses discrepencies about when you should double, single, and not
quote the hive/key parameters
2018-08-10 10:51:53 -06:00
Nicole Thomas
0d2a495378
Merge pull request #49050 from rallytime/merge-2017.7
[2017.7] Merge forward from 2017.7.8 to 2017.7
2018-08-10 09:43:48 -04:00
rallytime
ed6fb8b739
Merge branch '2017.7.8' into '2017.7'
No conflicts.
2018-08-10 09:08:47 -04:00
Nicole Thomas
189e28691f
Merge pull request #49044 from Ch3LL/vultr_test
increase timeout on vultr cloud integration test
2018-08-09 21:28:16 -04:00
Nicole Thomas
70be9ac9b1
Merge pull request #49046 from garethgreenaway/1022_fixing_test_failing_py3_Debian_test
[2017.7] Another fix to tests/integration/modules/test_service.py
2018-08-09 21:22:56 -04:00
Gareth J. Greenaway
fa2339bb91
The osfullname grain differs when using Python2 vs Python3, swapping this out for the "OS" grain which is consistent. 2018-08-09 17:12:06 -07:00
Ch3LL
0dedfae4d1
increase timeout on vultr cloud integration test 2018-08-09 17:33:56 -04:00
Nicole Thomas
c606a32cf2
Merge pull request #49042 from rallytime/flaky-jinja-test
Mark a jinja template test as flaky
2018-08-09 17:05:53 -04:00
Nicole Thomas
6415b6f73b
Merge pull request #49041 from Ch3LL/ec2_fix
[2017.7.8] backport PR #48212
2018-08-09 17:05:26 -04:00
rallytime
a43d9b4ba6
Mark a jinja template test as flaky
Fixes https://github.com/saltstack/salt-jenkins/issues/1059
2018-08-09 15:51:34 -04:00
Ch3LL
cf7f2459b8
[2017.7.8] backport PR #48212 2018-08-09 15:47:39 -04:00
Nicole Thomas
69c9b0afb1
Merge pull request #49036 from cspeidel/doc-fix-netyang
minor doc fix in netyang.py
2018-08-09 14:57:07 -04:00
Chris Speidel
f7ac085eb5
minor doc fix in netyang.py 2018-08-09 14:45:40 -04:00
Nicole Thomas
c5f3fd6b2b
Merge pull request #48997 from AVeenstra/patch-1
Python 3 related fix in highstate_return.py
2018-08-09 13:57:51 -04:00
Nicole Thomas
1db036406b
Merge pull request #49030 from rallytime/update-client-tests
Update netapi client tests
2018-08-09 13:11:14 -04:00
Nicole Thomas
c06a3cf531
Merge pull request #49021 from rallytime/merge-2017.7
[2017.7] Merge forward from 2017.7.8 to 2017.7
2018-08-09 10:32:42 -04:00
rallytime
f08ee6c6ae
Update netapi client tests
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
```
2018-08-09 10:11:20 -04:00
rallytime
ca82b3d57a
Merge branch '2017.7.8' into merge-2017.7 2018-08-09 08:44:07 -04:00
Nicole Thomas
f73ba21bc7
Merge pull request #49024 from rallytime/fix-deb-test
Fix test error in test_compiler jinja check
2018-08-09 08:43:22 -04:00
rallytime
a9c16d9137
Fix test error in test_compiler jinja check
The fix in #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.
2018-08-08 18:29:14 -04:00
rallytime
c6f8429e41
Merge branch '2017.7.8' into '2017.7'
No conflicts.
2018-08-08 17:18:22 -04:00
Nicole Thomas
6b6d68c615
Merge pull request #49020 from rallytime/fix-grains-test
Make grains integration test more robust
2018-08-08 16:59:18 -04:00
AVeenstra
0e535f2c8c
Unpacking dict with the six iterator 2018-08-08 21:55:31 +02:00
Nicole Thomas
2ddba6391a
Merge pull request #49010 from Ch3LL/univention
Add univention OS to debian os_family mapping
2018-08-08 15:44:03 -04:00
Nicole Thomas
92d6c25c7f
Merge pull request #49002 from rallytime/skip-jinja-deep-error-test
Skip test_jinja_deep_error on Debian 8
2018-08-08 15:18:38 -04:00
rallytime
f72a3ac6be
Make grains integration test more robust
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.
2018-08-08 14:58:05 -04:00
Nicole Thomas
41bd36842e
Merge pull request #48636 from terminalmage/loader-fixes
Properly handle optimized .pyc files in loader in PY3
2018-08-08 14:20:59 -04:00
Ch3LL
c09bce9afe
Add univention OS to debian os_family mapping 2018-08-08 12:47:25 -04:00
Erik Johnson
0441cd56ef
Add optimization_order to mocking 2018-08-08 11:22:52 -05:00
Erik Johnson
2256fad320
Process pycache files after .py files 2018-08-08 11:22:52 -05:00
Erik Johnson
a78663a301
Lint 2018-08-08 11:22:52 -05:00
Erik Johnson
0728b5f8b6
Add note about Python 3.5+ only support for optimization_order 2018-08-08 11:22:52 -05:00
Erik Johnson
764969ce08
Add a test to confirm that .py files are still loaded correctly
Also, use USE_IMPORTLIB to gate testing on optimization_order, since
this only works with Python 3.5+.
2018-08-08 11:22:52 -05:00
Erik Johnson
0f60beb6b6
Fix bad copypasta 2018-08-08 11:22:52 -05:00
Erik Johnson
fbcd142ea2
Add configuration docs for optimization_order config option 2018-08-08 11:22:52 -05:00
Erik Johnson
8af2d580f3
Only compile the suffix_order/map once per LazyLoader instance
The values that dictate this are module-level globals, so repeating this
every time we refresh the file mapping is unnecessary.
2018-08-08 11:22:52 -05:00
Erik Johnson
4b95e5f313
Don't put __pycache__ dir in the file list
This prevents the loader from needlessly trying to process it (which
will fail anyway since it's not a file).
2018-08-08 11:22:52 -05:00
Erik Johnson
e7c10196da
Quiet the byte compiling for PY2 2018-08-08 11:22:52 -05:00