Commit Graph

13538 Commits

Author SHA1 Message Date
Erik Johnson
b49d8df210
Fix bad copypasta in docstring 2018-08-14 13:53:29 -05:00
Erik Johnson
069102b82d
Rename sentry returner test to match naming convention 2018-08-14 13:53:29 -05:00
Erik Johnson
23980830d1
Use tests.support.paths instead of deprecated integration module 2018-08-14 13:53:29 -05:00
Erik Johnson
ffb842d055
Move salt.utils.context tests to their proper location 2018-08-14 13:53:28 -05:00
Erik Johnson
d69069be13
Move context cache tests to their proper location 2018-08-14 13:53:28 -05:00
rallytime
4649f60209
Update old utils paths with new paths 2018-08-14 09:52:40 -04:00
rallytime
49c2a784bb
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/modules/file.py
  - salt/modules/reg.py
  - salt/states/reg.py
  - tests/integration/states/test_file.py
2018-08-14 09:48:13 -04:00
Nicole Thomas
bc033da677
Merge pull request #49071 from rallytime/bp-49034
Back-port #49034 to 2018.3
2018-08-13 16:15:30 -04:00
Nicole Thomas
90c2f026b3
Merge pull request #49077 from rallytime/bp-49075
Back-port #49075 to 2018.3
2018-08-13 15:59:59 -04:00
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
0e1ed7b923
Merge pull request #49055 from rallytime/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
2018-08-13 15:20:10 -04:00
Daniel Wallace
5e07b8306b
fix last async issue 2018-08-13 12:25:49 -04:00
rallytime
83a15cb623
Add optimization_order config to mocked opts 2018-08-13 12:06:48 -04:00
Gareth J. Greenaway
8108a4d31a
Adding some tests for the grains, pillar and mine functions in the cache runner. These will also ensure that the relevant functions in salt.utils.master.MasterPillarUtil are functioning properly. 2018-08-13 10:47:47 -04:00
Nicole Thomas
b0d5acbe0d
Merge pull request #49052 from isbm/isbm-python37-support-2018.3
Python 3.7 support (backport 2018.3)
2018-08-13 09:06:50 -04:00
Nicole Thomas
338ecb70ef
Merge pull request #49026 from dwoz/issue_48557
Fix file.line line endings
2018-08-13 09:05:41 -04:00
Daniel Wallace
4386a9ca1f
Merge branch '2018.3' into isbm-python37-support-2018.3 2018-08-10 15:47:12 -05:00
rallytime
ea6883ee55
Update old utils paths to new utils paths 2018-08-10 13:15:53 -04:00
rallytime
201031fa8a
Merge branch '2017.7' into '2018.3'
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
2018-08-10 13:12:14 -04:00
Daniel Wallace
6bc44c91c4
remove localhost from tests
now that enable_ssh_minions is turned off, remove localhost from
returns.
2018-08-10 09:03:35 -05:00
Daniel Wallace
7b168a5aac
disable enable_ssh_minions to see if it is slowing down 2018.3 tests 2018-08-10 09:03:35 -05:00
Bo Maryniuk
47078a300f Remove async keyword, moving it into the kwargs. 2018-08-10 15:59:24 +02:00
Bo Maryniuk
31dccc4fdf fix unicode literals 2018-08-10 15:59:24 +02:00
Bo Maryniuk
35eaebb8a4 Fix docstrings 2018-08-10 15:59:23 +02:00
Bo Maryniuk
b7da571624 Fix imports 2018-08-10 15:52:01 +02:00
rallytime
ed6fb8b739
Merge branch '2017.7.8' into '2017.7'
No conflicts.
2018-08-10 09:08:47 -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
4eeb75f028
Merge pull request #49033 from terminalmage/issue48996
Fix file.get_diff for remote files
2018-08-09 17:06:52 -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
b24c96a292
Merge pull request #48926 from travispaul/fix-netbsd-8-new-ifconfig
Handle ifconfig output differently for NetBSD >= 8.0
2018-08-09 16:07:43 -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
Nicole Thomas
7d6b9ed0a5
Merge pull request #48803 from dmurphy18/aix_filesystems
Support for execution modules and states mount on AIX
2018-08-09 13:51:54 -04:00
Nicole Thomas
702e76cfc9
Merge branch '2018.3' into issue_48557 2018-08-09 13:47:06 -04:00
Nicole Thomas
9b6a9ff4f1
Merge pull request #48932 from twangboy/fix_win_repo
Fix pkg.install when pkg already installed
2018-08-09 13:45:50 -04:00
Nicole Thomas
d7b7a92ef6
Merge pull request #49011 from rallytime/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
2018-08-09 13:34:17 -04:00
Erik Johnson
d6e5038022
Fix file.get_diff for remote files
Once the files were cached, the function was still trying to open the
paths passed into it, not the cached paths. This fixes that and adds
additional unit tests.
2018-08-09 10:56:05 -05:00
Nicole Thomas
3325b7d4c0
Merge pull request #48985 from garethgreenaway/48123_file_directory_recurse_fails_broken_symlink
[2018.3] Fix to salt/modules/file.py
2018-08-09 11:03:08 -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
00416d54d1
Revert "add key-deploy test"
This reverts commit 5b443af7ae.
2018-08-09 09:50:40 -04:00
Travis Paul
d59b6d8269
Add unit test for NetBSD 8 ifconfig changes
lint changes in salt/utils/network.py
2018-08-09 21:26:08 +08:00
Nicole Thomas
d353c02a8c
Merge pull request #49019 from garethgreenaway/47695_fixing_scheduler_bug_when_enabled_is_present
[2018.3] Fix to scheduler when global enabled key is present
2018-08-09 09:06:25 -04:00
rallytime
ca82b3d57a
Merge branch '2017.7.8' into merge-2017.7 2018-08-09 08:44:07 -04:00
Daniel A. Wozniak
2cf80c1595
Fix linter errors 2018-08-08 19:58:30 -07:00
Daniel A. Wozniak
baf291b4c8
Fix file.line line endings 2018-08-08 19:48:41 -07: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
Gareth J. Greenaway
aff1b8f6d4
Lint. 2018-08-08 14:33:25 -07: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
Nicole Thomas
4590494b50
Merge pull request #48981 from Ch3LL/mac_runas_quote
Add warning to mac runas docs about escaping characters
2018-08-08 15:43:42 -04:00