valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
94,970 Commits 24 Branches 182 Tags 341 MiB
1eaaab705f
Commit Graph

4992 Commits

Author SHA1 Message Date
Daniel A. Wozniak
9da79dd0b5
Allow test suite to finish if tmp dir removal fails 2018-08-16 10:48:19 -07:00
Ch3LL
d2e73cc988
Remove -Z script_arg for cloud tests 2018-08-15 17:35:23 -04:00
Ch3LL
a1ef6a88a6
Remove -Z script_arg for cloud tests 2018-08-15 17:27:02 -04:00
Ch3LL
3a8fed5e57
Handle race condition when running mine.update in orch mine test 2018-08-15 13:16:26 -04:00
Ch3LL
b4e421c3d6
Add orch runner with mine.get integration tests 2018-08-15 13:16:26 -04:00
Erik Johnson
ec258e235d
Add integration tests for yaml and json filters 2018-08-14 17:02:17 -05:00
Erik Johnson
3d8523b031
Fix import for moved module 2018-08-14 13:53:31 -05:00
Erik Johnson
613f0611f8
Lint 2018-08-14 13:53:31 -05:00
Erik Johnson
fba03360f4
Rename venafi test module to bring it closer to the naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
9c145009da
Rename exec module integration test files to respect naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
91fa09ec79
Rename providers to clouds to respect naming convention 
Also, move rackspace openstack-based tests to test_openstack.py
 2018-08-14 13:53:30 -05:00
Erik Johnson
f1b7d54fdd
Rename virtualenv state test module to respect naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
c1f94dbf1b
Split ssh state tests into separate modules to respect naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
9c8ba4a633
Split mysql database tests into two modules to respect naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
d51748eea2
Rename some files to avoid them being identified as test modules 2018-08-14 13:53:30 -05:00
Erik Johnson
b03a56355b
Move jinja templating tests alongside salt/utils/jinja.py's tests 2018-08-14 13:53:29 -05:00
Daniel A. Wozniak
c6b781eea5
Multiple fixes for integration.states.test_file 
- Fix wart in PR #49087 file://c:\foo\bar vs c:\foo\bar local paths
- Finalize fix for test_issue_8343_accumulated_require_in
- Fix wart in PR #49088 Ignore proper directory test
 2018-08-14 11:43:21 -07: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
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
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
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
702e76cfc9
Merge branch '2018.3' into issue_48557 2018-08-09 13:47:06 -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
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
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
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
Gareth J. Greenaway
8935c08141
Fixing a bug that occurs if the "enabled" key is present in the scheduler items dictionary. Adding a test to ensure scheduler runs as expected when that key is present. 2018-08-08 11:44:13 -07:00
rallytime
c26fa0d6c4
Mark orchestration test as expensive 2018-08-08 13:38:09 -04:00
rallytime
fceb6d8d6f
Update old utils paths to use new paths 2018-08-08 13:35:30 -04:00
rallytime
3e6445a9d6
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - salt/beacons/log.py
  - salt/client/ssh/__init__.py
  - salt/modules/cmdmod.py
  - salt/utils/win_functions.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/netapi/rest_tornado/test_app.py
  - tests/integration/runners/test_state.py
 2018-08-08 13:31:57 -04:00
Erik Johnson
0441cd56ef
Add optimization_order to mocking 2018-08-08 11:22:52 -05:00
rallytime
23b66ef8bb
Skip test_jinja_deep_error on Debian 8 
This is a flaky test on Debian 8, so let's skip it for now.
 2018-08-08 10:36:56 -04:00
rallytime
df8699e2e7
Merge branch '2017.7.8' into '2017.7' 
No conflicts.
 2018-08-07 21:30:24 -04:00
Gareth J. Greenaway
a404cc030f
Fixing the issue when using the file.directory state with recurse if the directory contains a broken symbolic link. This fix adds an additional conditional, is_link, before running lsattr since lsattr does not work on symlinks and causes issues when that symlink is broken. 2018-08-07 15:46:24 -07:00
Nicole Thomas
ab1a713bc3
Merge pull request #48934 from terminalmage/issue48777 
Properly handle latin-1 encoding in file diffs
 2018-08-07 17:02:23 -04:00
Ch3LL
4e9e985b14
Add warning to mac runas docs about escaping characters 2018-08-07 15:24:14 -04:00
Nicole Thomas
a1e54634dc
Merge pull request #48976 from rallytime/tornado 
Skip unreliable tornado tests
 2018-08-07 14:55:24 -04:00
Nicole Thomas
22713be9c1
Merge pull request #48979 from rallytime/bp-48959 
Back-port #48959 to 2017.7.8
 2018-08-07 14:11:52 -04:00
Nicole Thomas
5b2423e527
Merge pull request #48959 from rallytime/flaky-tests 
Mark some more tests as flaky
 2018-08-07 12:33:15 -04:00
rallytime
0bd838ab6c
Skip unreliable tornado tests 
Marked as flaky originally, but they're still flaky with undetermined
race-conditions. These are skipped in 2018.3 and forward, so let's skip
them here as well.
 2018-08-07 11:22:18 -04:00
Gareth J. Greenaway
3ce1b8a3c9
Update the elif block to only be true for versions below Debian 9. 2018-08-07 09:58:40 -04:00
Nicole Thomas
79994ecab4
Merge pull request #48962 from garethgreenaway/1022_test_service_disable_debian_part_deux 
[2017.7] Fixing tests/integration/modules/test_service.py
 2018-08-07 07:52:51 -04:00
Daniel Wozniak
1a1bda00cb
Merge pull request #48960 from dwoz/block_replace_tests 
Multiple block replace test fixes
 2018-08-06 16:01:25 -07:00
Gareth J. Greenaway
9e71551b36
Update the elif block to only be true for versions below Debian 9. 2018-08-06 15:11:55 -07:00
Daniel A Wozniak
94ac2b4fc7
Multiple block replace test fixes 2018-08-06 13:35:21 -07:00
rallytime
aaf986d728
Mark one grains test as flaky & convert to pytest notation 2018-08-06 15:03:27 -04:00
rallytime
e7e5abcf48
Mark 2 matcher tests as flaky 2018-08-06 14:47:44 -04:00
rallytime
668da57ab9
Mark some shell and runner integration tests as flaky 
In addition to marking these tests as flaky, the commit also updates
the affected tests to use pytest notation instead of unittest notation.
 2018-08-05 16:19:29 -04:00
Nicole Thomas
43649a68be
Merge pull request #48935 from garethgreenaway/1045_test_pkg_015_installed_held_centos 
[2017.7] Fix to test_pkg.test_pkg_015_installed_held
 2018-08-05 15:47:38 -04:00
Nicole Thomas
2421e2a570
Merge pull request #47100 from gtmanfred/ssh 
Allow for not being prompted to supply a password to deploy keys to a…
 2018-08-05 15:12:57 -04:00
Nicole Thomas
0bb10107b6
Merge branch '2017.7' into 1045_test_pkg_015_installed_held_centos 2018-08-05 14:12:26 -04:00
Nicole Thomas
abd7f1312d
Merge pull request #48928 from Ch3LL/mac_runas 
fix test_runas integration test for macosx
 2018-08-05 10:24:12 -04:00
Gareth J. Greenaway
24d5e6a22f
Fixing the test_pkg_015_installed_held test to be able to successfully run on CentOS 2018-08-03 21:36:59 -07:00
Gareth J. Greenaway
280d1d2ad2
Fixing failing test, integration.modules.test_service.ServiceModuleTest.test_service_disable_doesnot_exist, on Debian 8 and higher. 2018-08-03 16:39:48 -07:00
Erik Johnson
726dd4331f
Add integration test for latin-1 file diffs 2018-08-03 17:30:17 -05:00
Erik Johnson
2dd1f31d23
Use BASE_FILES instead of redundant STATE_DIR 2018-08-03 16:46:01 -05:00
Ch3LL
3d6455dbcd
remove unecessary comment in setup 2018-08-03 15:34:46 -04:00
Ch3LL
8e30db0217
move destructivetest to testname 2018-08-03 15:32:15 -04:00
Nicole Thomas
905da13653
Merge branch '2017.7' into cmd_win_tests 2018-08-03 15:10:29 -04:00
Ch3LL
708dec8740
add destructivetest to setup and teardown for runas test 2018-08-03 15:09:10 -04:00
Ch3LL
c0730ff968
fix test_runas integration test for macosx 2018-08-03 14:57:15 -04:00
rallytime
b3a5aa49d7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/integration/modules/test_shadow.py
  - tests/integration/netapi/rest_tornado/test_app.py
 2018-08-02 15:45:36 -04:00
Nicole Thomas
f8bfab4f9f
Merge pull request #48890 from Ch3LL/cmd_test 
add sleep in test_cmd integration test
 2018-08-02 15:15:07 -04:00
Nicole Thomas
52722f6ded
Merge pull request #48885 from rallytime/flaky-tests-shadow 
Mark shadow module integration test as flaky
 2018-08-02 15:04:34 -04:00
Ch3LL
acda4ed9ab
add sleep in test_cmd integration test 2018-08-02 13:36:33 -04:00
Nicole Thomas
38d9eae537
Merge branch '2017.7' into flaky-tests-matchers 2018-08-02 13:29:57 -04:00
Nicole Thomas
0ca0b6f2f2
Merge pull request #48883 from terminalmage/salt-jenkins-1023 
Fix failing git worktree tests
 2018-08-02 12:51:39 -04:00
rallytime
da871a2d57
Mark shadow module integration test as flaky 
This test fails sometimes, so let's mark it as flaky.

I have tried to reproduce the failure and fix it, but to no avail.

Let's mark it as flaky for now.
 2018-08-02 11:12:35 -04:00
rallytime
3660dff13c
Separate compound matcher tests into individual tests 
When one match fails (and some of these can be flaky) the whole test fails.

This makes it somewhat difficult to track down why the test fails.

I am hoping we won't need the sleeps in this change when the tests are separate,
but let's see how that goes. It worked fine in my testing.

I also updated the test to use pytest notation, rather than unittest.
 2018-08-02 10:42:03 -04:00
Erik Johnson
c61f75cb50
Fix failing git worktree tests 
Git 2.18.0 changed the output format against which some of the asserts
in this test are performed. Instead of displaying the full path to the
worktree, it now references the branch name instead. This test updates
the asserts to look for the basename instead, which should allow it to
pass on Git releases both before and after 2.18.0.
 2018-08-02 09:26:27 -05:00
Nicole Thomas
a84f5155a1
Merge pull request #48869 from Ch3LL/mac_shell_tests 
Catch socket.error exception in testprogram
 2018-08-02 10:19:22 -04:00
Daniel A. Wozniak
f2e15e7f1d
Do not re-define tearDown 2018-08-01 15:11:29 -07:00
Daniel A. Wozniak
4f8a191a69
Remove unicode key pairs from environ after test 2018-08-01 14:28:57 -07:00
Ch3LL
3734b1ec89
Catch socket.error exception in testprogram 2018-08-01 16:35:16 -04:00
rallytime
7320aa9104
Skip unreliable tornado test. 
Even with the flaky decorator, it still fails _sometimes_. This is not
a useful test as it sits. Skipping it for now.
 2018-08-01 15:46:03 -04:00
Ch3LL
9312a993a5
Add cmd module integration tests for windows and fix space in path issue 2018-08-01 14:05:52 -04:00
rallytime
92c9317a25
Update old utils paths to use new paths 2018-07-31 18:20:35 -04:00
rallytime
15bfba7143
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/slsutil.py
  - salt/modules/win_timezone.py
  - salt/states/pkg.py
  - tests/integration/states/test_pkg.py
 2018-07-31 18:18:58 -04:00
Nicole Thomas
05f2d65de3
Merge pull request #48853 from rallytime/bp-48850 
Back-port #48850 to 2017.7
 2018-07-31 16:21:48 -04:00
Nicole Thomas
8a1285239a
Merge pull request #48426 from garethgreenaway/46689_fixing_pkg_held_when_package_is_installed 
[2017.7] fixes to states/pkg.py
 2018-07-31 16:18:04 -04:00
rallytime
3c33ee554a
Skip tests in integration.shell.test_master 
Related to https://github.com/saltstack/salt-jenkins/issues/378

This is likely causing all of the flakiness we're seeing on test runs
when the master stops responding.

These tests should be in their own, isolated run, rather than with
the rest of the test suite.
 2018-07-31 15:22:34 -04:00
Daniel Wallace
5b443af7ae
add key-deploy test 2018-07-31 13:36:43 -05:00
Nicole Thomas
2bacc23481
Merge pull request #48796 from Ch3LL/remove_su 
Remove fake su used in integration tests
 2018-07-31 13:08:53 -04:00
Gareth J. Greenaway
16fb6ae635
Make sure pkg.hold and pkg.unhold are available before running the test. 2018-07-31 09:46:05 -07:00
Gareth J. Greenaway
998651102d
Fixing a situation when a package is already installed via salt or manually and a state attempts to set that package to be held. Previously the holding/unholding logic was only being run against packages that were being installed. This change moves the holding logic outside and runs it against all desired packages. Adding a new test to test holding logic. 2018-07-31 09:46:05 -07:00
Daniel Wozniak
69f81214d1
Merge pull request #48714 from dwoz/state_echo_fix 
Always transfer bytes from fileserver roots
 2018-07-30 15:37:12 -07:00
Orlando Richards
66936b4f41 Changed string comparison in pip test to match new confirmation string - ref PR #47734. 2018-07-29 21:32:24 +00:00
Nicole Thomas
2e00939a6e
Merge pull request #48788 from Ch3LL/timezone_windows 
Add timzeone windows integration tests and fix get_zone
 2018-07-27 16:14:29 -04:00
Ch3LL
de95a6a215
add unused import to timezone test file 2018-07-27 15:42:35 -04:00
rallytime
487458ad4b
Update old utils paths to use new utils paths 2018-07-27 11:57:34 -04:00
rallytime
436510796f
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-07-27 11:44:07 -04:00
Erik Johnson
b6f73e8e57
Remove trailing whitespace on what should be a blank line 2018-07-27 09:15:05 -05:00
Nicole Thomas
8e61f3dce0
Merge pull request #48742 from frogunder/45014 
add windows integration tests for states.file
 2018-07-27 09:57:26 -04:00
Ch3LL
d3b7f2cb18
Remove fake su used in integration tests 2018-07-27 09:36:23 -04:00
William Giokas
d4ca0e3a97
test: except for OSError only 2018-07-26 17:27:02 -04:00
Ch3LL
f09d1a2c7e
Add timzeon windows integration tests and fix get_zone 2018-07-26 16:44:55 -04:00
Frode Gundersen
f08058b043 Merge branch '45014' of https://github.com/frogunder/salt into 45014 2018-07-26 20:09:17 +00:00
Frode Gundersen
33c20c1ec0
fix tests 2018-07-26 20:04:51 +00:00
Nicole Thomas
6978ce5d1d
Merge pull request #48747 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-07-26 14:14:33 -04:00
Nicole Thomas
f2ef2d3ef6
Merge pull request #48752 from garethgreenaway/fix_state_file_all_integers 
[2018.3] Fix when state file is integers
 2018-07-25 11:03:01 -04:00
Gareth J. Greenaway
790801c67e
Fixing a case where the state module would fail if the state file being passed was all integers. Added a new tests for this edge case. 2018-07-24 14:00:37 -07:00
rallytime
4122da40b5
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/integration/netapi/rest_tornado/test_app.py
  - tests/integration/states/test_service.py
 2018-07-24 14:28:33 -04:00
Frode Gundersen
757fde70c6
Merge branch '2017.7' into 45014 2018-07-24 11:07:14 -06:00
Frode Gundersen
a7a914060d
add windows integration tests for states.file 2018-07-24 16:42:07 +00:00
Nicole Thomas
ce4e22224e
Merge pull request #48720 from Ch3LL/mac_file_path 
Fix test_managed_source_hash_indifferent_case on macosx to correct tmp path
 2018-07-23 18:32:56 -04:00
Ch3LL
01d25fae19
Fix test_managed_source_hash_indifferent_case on macosx to correct tmp path 2018-07-23 15:02:27 -04:00
Ch3LL
f44a2fc349
Enable service if disabled before running state service tests 2018-07-23 14:05:31 -04:00
rallytime
7332cce567
[2017.7] Mark some tornado tests as flaky 2018-07-23 12:53:26 -04:00
Daniel A Wozniak
aa34a80997
Always trasfer bytes from fileserver roots 
Fixes a state test on windows (py3) where utf-8 data was getting
improperly decoded before fileserver sends the data to a client.
 2018-07-23 09:43:45 -07:00
rallytime
ea5c063237
Update old utils paths to use new paths 2018-07-23 11:32:08 -04:00
rallytime
e740d3b208
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/client/ssh/state.py
  - salt/client/ssh/wrapper/state.py
  - salt/modules/dockermod.py
  - salt/modules/npm.py
  - salt/modules/testinframod.py
  - tests/integration/modules/test_mac_system.py
  - tests/integration/modules/test_mac_timezone.py
  - tests/integration/ssh/test_state.py
  - tests/integration/states/test_user.py
  - tests/unit/modules/test_npm.py
  - tests/unit/states/test_file.py
 2018-07-23 11:15:43 -04:00
Daniel A. Wozniak
d731e6bf8e
Call sync_all to fix Windows test case 2018-07-21 18:00:59 -07:00
Ch3LL
4b7d6d80c5
Remove unnecessary jinja in curl.sls file 2018-07-20 14:32:14 -04:00
Ch3LL
2bedadfadb
Add windows pkg module integration tests 2018-07-20 12:47:37 -04:00
Nicole Thomas
96447ce541
Merge pull request #48656 from Ch3LL/windows_ip_mod 
Add windows ip module integration tests
 2018-07-20 10:57:44 -04:00
Nicole Thomas
1ebd96d909
Merge pull request #48664 from Ch3LL/srv_disable_mac 
[2017.7] Fix service.disabled test for macosx
 2018-07-20 10:32:55 -04:00
Nicole Thomas
33812f78f1
Merge pull request #48673 from Ch3LL/mac_port 
Use different pub and ret ports for testprogram integration tests
 2018-07-20 10:11:51 -04:00
Ch3LL
c78efab828
Fix mac service.disable tests 2018-07-19 14:15:58 -04:00
Ch3LL
87dd85a220
Use different pub and ret ports for testprogram integration tests 2018-07-19 13:07:27 -04:00
Ch3LL
bddfbd75d2
reverse assertion order for service disable test 2018-07-19 10:38:10 -04:00
Ch3LL
f1fbfad387
move the disable call up in try block 2018-07-19 10:32:21 -04:00
Ch3LL
f60d21bda4
reverse assertion order for service disable test 2018-07-19 10:29:18 -04:00
Ch3LL
3727d1b3b9
switch try/except to match 2018.3 2018-07-18 18:05:17 -04:00
Ch3LL
fb953c2369
[2017.7] Fix service.disabled test for macosx 2018-07-18 17:58:44 -04:00
Ch3LL
2bfaf7fe89
Fix service.disabled test for macosx 2018-07-18 17:43:24 -04:00
Ch3LL
90c3f568b1
Add windows ip module integration tests 2018-07-18 13:58:17 -04:00
Daniel A Wozniak
9dfd2ae392 Sync modules for state tests 2018-07-17 19:00:18 +00:00
Nicole Thomas
5391dd0a8d
Merge pull request #48584 from Ch3LL/mac_user_grp 
Fix grp import for mac in test_user integration test
 2018-07-16 15:28:12 -04:00
Nicole Thomas
61572b6780
Merge pull request #48555 from Ch3LL/ssh_id 
Fix state.sls_id not running on ssh minion
 2018-07-16 09:24:41 -04:00
Ch3LL
585ee9db90
Fix grp import for mac in test_user integration test 2018-07-13 16:25:28 -04:00
Ch3LL
4ba2299a87
import flaky decorator on mac tests 2018-07-13 15:16:06 -04:00
Ch3LL
811220b41e
Add flaky decorator to mac_system and mac_timezone tests 2018-07-13 14:40:26 -04:00
Ch3LL
f69932f506
fix pylint 2018-07-12 12:37:24 -04:00
Ch3LL
70e36764ee
Add more tests for salt-ssh state.sls_id 2018-07-12 12:16:33 -04:00
rallytime
f9b8c4b257
Use () when using with_tempfile decorator in tests 2018-07-12 09:48:40 -04:00
rallytime
d3190ca0c0
Update old utils paths to new utils paths 2018-07-11 14:52:54 -04:00
rallytime
29b05ffdd1
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - pkg/windows/req.txt
  - tests/integration/runners/test_state.py
  - tests/integration/states/test_file.py
  - tests/integration/states/test_npm.py
 2018-07-11 14:49:27 -04:00
Nicole Thomas
ad5a959ab9
Merge pull request #48388 from garethgreenaway/48277_2017_7_file_roots_wrong 
[2017.7] reset file_roots for renderers after compile_pillar
 2018-07-11 09:13:45 -04:00
Nicole Thomas
5a0b274bf1
Merge pull request #48389 from garethgreenaway/48277_2018_3_file_roots_wrong 
[2018.3] reset file_roots for renderers after compile_pillar
 2018-07-11 09:13:32 -04:00
Daniel Wallace
9ba0f6b3a0
pin pm and grunt packages for npm tests 
Until at least ubuntu 14 is dead.
 2018-07-10 15:03:18 -05:00
Nicole Thomas
16d3daab3c
Merge pull request #48375 from Ch3LL/file_copy 
Add user and group to makedirs cmd in file.copy
 2018-07-10 08:35:10 -04:00
Ch3LL
d16a790775
Add mode to _makedirs call in file.copy 2018-07-09 15:47:37 -04:00
Daniel Wozniak
5ca5e060b3
Merge branch '2018.3' into test_git 2018-07-06 12:11:53 -07:00
Nicole Thomas
a9dc758e73
Merge pull request #48398 from garethgreenaway/48336_ensure_chmodd_setuid_with_chown 
[2018.3] fixes to module/file.py
 2018-07-06 14:02:42 -04:00
Nicole Thomas
acf42864aa
Merge pull request #48399 from garethgreenaway/48336_2017_7_ensure_chmod_setuid_with_chown 
[2017.7] fixes to module/file.py
 2018-07-06 14:02:29 -04:00
rallytime
3e59dda0b1
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-07-03 16:09:28 -04:00
rallytime
4c691ac57a
Add regression test for Issue #48230 
This also tests the fix for issue #38914
 2018-07-02 16:56:49 -04:00
Gareth J. Greenaway
4b492fa633
Removing unused start_time variable from test_orchestration_with_pillar_dot_items test. 2018-07-02 11:55:46 -07:00
Gareth J. Greenaway
30c5855d20
Fixing a few things in the new test. 2018-07-02 11:55:46 -07:00
Gareth J. Greenaway
36b7253418
Fixing lint issue 2018-07-02 11:55:46 -07:00
Gareth J. Greenaway
ab6abfad31
When pillar items are compiled a new render is instantiated but the file_roots is the pillar_roots. This change forces the __opts__['file_roots'] to be set to what is set in actual_file_roots for all renderers once compile_pillar has finished. Adding a test when this situation is run via a orchestration runner. 2018-07-02 11:55:46 -07:00
Gareth J. Greenaway
6f11da35a7
Fixing a few things in the new test. 2018-07-02 11:20:35 -07:00
Gareth J. Greenaway
cf747b14ec
Fixing lint issue 2018-07-02 11:20:35 -07:00
Gareth J. Greenaway
16d36c79c8
When pillar items are compiled a new render is instantiated but the file_roots is the pillar_roots. This change forces the __opts__['file_roots'] to be set to what is set in actual_file_roots for all renderers once compile_pillar has finished. Adding a test when this situation is run via a orchestration runner. 2018-07-02 11:20:35 -07:00
Gareth J. Greenaway
8efd33320f
Normalize the mode before we compare it. 2018-07-02 09:11:42 -07:00
Gareth J. Greenaway
2454652914
Normalize the mode before we compare it. 2018-07-02 09:06:22 -07:00
Gareth J. Greenaway
08ad5665de
Fixing test to ensure it works under py3 2018-07-02 08:51:55 -07:00
Gareth J. Greenaway
f894f0ecb8
Setting the mode with setuid or setgid bits in addition to setting the owner and group will force the setuid & setgid bits to reset. This change ensures that we set the mode after setting the owner & group. 2018-07-01 12:33:10 -07:00
Gareth J. Greenaway
2b25d8c95b
Setting the mode with setuid or setgid bits in addition to setting the owner and group will force the setuid & setgid bits to reset. This change ensures that we set the mode after setting the owner & group. 2018-07-01 12:19:48 -07:00
rallytime
c4fd2a0930
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/rabbitmq.py
  - tests/integration/modules/test_pip.py
 2018-06-30 09:33:21 -04:00
Nicole Thomas
89857ea8b9
Merge pull request #48297 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-06-30 08:57:34 -04:00
Ch3LL
2cbcb4fd26
Add user and group to makedirs cmd in file.copy 2018-06-29 10:39:02 -04:00
Daniel A. Wozniak
e8362adf71
fopen does not support encoding 2018-06-28 10:16:52 -07:00
Daniel A. Wozniak
487161ba8f
Fix file encoding on windows 2018-06-27 18:33:18 -07:00
Daniel A Wozniak
fc760685ee
Fix multiple git module tests 2018-06-27 18:28:58 -07:00
Nicole Thomas
34b24bb7fa
Merge branch '2018.3' into issue47937 2018-06-27 13:41:34 -04:00
Nicole Thomas
21ed5b97ce
Merge pull request #48295 from rallytime/bp-48193 
Back-port #48193 to 2017.7
 2018-06-26 19:42:17 -04:00
Nicole Thomas
caf630487c
Merge pull request #48207 from rallytime/bp-48189 
Back-port #48189 to 2017.7
 2018-06-25 15:26:55 -04:00
rallytime
1c8bd35f28
Update old utils paths to use new utils paths 2018-06-25 10:45:24 -04:00
rallytime
c7bb8a50b0
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/x509.py
  - salt/runners/cloud.py
  - tests/unit/modules/test_state.py
 2018-06-25 10:41:06 -04:00
Thomas Jackson
c0180ff33d
Properly configure syndic in test case 
Without this option we aren't really a syndic and it won't wait
 2018-06-25 10:26:30 -04:00
rallytime
e9d09e0375
Use old is_windows utils path on 2017.7 2018-06-25 10:06:37 -04:00
Gareth J. Greenaway
aea4f7ae14
Fixing test_local_batch 2018-06-24 16:03:47 -07:00
Gareth J. Greenaway
ce3e1eaf2c
Removing sort. 2018-06-23 11:25:46 -07:00
Gareth J. Greenaway
83accf3b20
Fixing test_local_batch 2018-06-22 12:19:41 -07:00
Gareth J. Greenaway
85cef126e0
Adding note about why salt.utils.versions is being re-imported. Adding a test for local_batch. 2018-06-22 12:19:40 -07:00
Nicole Thomas
51928ff050
Merge pull request #48166 from terminalmage/salt-jenkins-1000 
Add trace logging and optimize file handling in grains.core.os_data
 2018-06-21 14:02:32 -04:00
Daniel A. Wozniak
70c603451b
Fix py2 thin dir issues 2018-06-20 17:16:30 -07:00
Daniel Wallace
b965d6c9b3
If pip binary is passed to bin_env, use that pip binary 
We don't need to do a lookup for python to then run `python -m pip`
because we already know where pip is.

Fixes using /bin/pip3

Fixes #48122
 2018-06-19 14:09:11 -04:00
Nicole Thomas
96f79b0674
Merge pull request #48189 from gtmanfred/pip 
If pip binary is passed to bin_env, use that pip binary
 2018-06-19 14:08:12 -04:00
Daniel Wallace
96c59f3d93
If pip binary is passed to bin_env, use that pip binary 
We don't need to do a lookup for python to then run `python -m pip`
because we already know where pip is.

Fixes using /bin/pip3

Fixes #48122
 2018-06-18 16:21:58 -05:00
Alexey Aksenov
9ed2d2ec55 Fix integration.shell.test_key and integration.shell.test_runner 2018-06-18 17:39:35 +03:00
Alexey Aksenov
26a6f79730 Fix integration tests test_list_acc_wrong_eauth, test_salt_run_with_wrong_eauth 2018-06-18 17:39:23 +03:00
Erik Johnson
2c64b270df
Add timestamp to the minion's log_fmt_console 
This makes salt-call show timestamps in stdout/stderr when run from
integration tests (e.g. in ShellCase.run_script).
 2018-06-18 00:16:02 -05:00
Max Arnold
3d4fcbe3aa Add test for issue #48145 2018-06-15 23:48:14 +07:00
Nicole Thomas
b10b7355a0
Merge pull request #48054 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-06-13 08:58:45 -04:00
Daniel Wallace
d8c035e5e5
mark test as expensive 
This tests takes a large amount of cpu to run, and is causing tests to
hang.

Mark it as an expensive test so it only runs with the cloud tests.
 2018-06-11 16:08:10 -05:00
rallytime
508d70fabf
Update old utils paths to use new paths 2018-06-11 11:49:10 -04:00
rallytime
3d2ea16c3a
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - requirements/base.txt
  - salt/states/archive.py
  - salt/states/file.py
  - tests/integration/runners/test_state.py
  - tests/unit/daemons/test_masterapi.py
 2018-06-11 11:45:37 -04:00
Erik Johnson
b33a0b5eaa
Switch to trace level logging for further test failure troubleshooting 2018-06-08 17:06:49 -05:00
Mike Place
ea85f882bc
Merge pull request #47915 from garethgreenaway/state_runner_pause_resume_kill 
[2018.3] state runner pause resume kill
 2018-06-07 10:08:29 -06:00
Gareth J. Greenaway
f457f9cb84
Adding a test to ensure archive.list returns the right results when a tar file contains a file with unicode in it's name. 2018-06-06 21:23:28 -07:00
Gareth J. Greenaway
4377e0cc08
Some fixes to the set_pause and rm_pause function in the state runner, renaming to in line with the functions in the state module. Including aliases to previous names for back-ward compatibility. Including a soft_kill function to kill running orchestration states. A new test to test soft_kill functionality. 2018-06-06 13:52:45 -07:00
Nicole Thomas
42dd6b83eb
Merge pull request #47978 from twangboy/fix_test_pkg 
Add try/finally, fix typo in 7zip def file
 2018-06-06 15:06:03 -04:00
Nicole Thomas
a67b21ef3d
Merge pull request #47959 from twangboy/fix_test_service 
Fix failing test when service doesn't exist
 2018-06-06 15:05:42 -04:00
Gareth J. Greenaway
7b7fb1f5d5
Adding missing test sls file. 2018-06-06 09:00:42 -07:00
Gareth J. Greenaway
54e51bc627
Backporting #47843 to 2017.7, updating test for 2017.7. 2018-06-06 09:00:42 -07:00
Erik Johnson
41e5a75027
Add catch_timeout to run_script 
One of the tests depends on forcing a timeout, but since we no longer
include the timeout message in the stdout/stderr return, we needed a way
to return whether or not the script timed out.
 2018-06-06 09:04:09 -05:00
twangboy
8bb36b3a4b
Add try/finally, fix typo in 7zip def file 2018-06-05 13:29:49 -06:00
Erik Johnson
4a8260a5e5
Add tests for git.cloned state 2018-06-05 12:32:40 -05:00
twangboy
0cd47aa81e
Remove unused import 2018-06-04 18:12:16 -06:00
twangboy
d4b42540e3
Fix failing test when service doesn't exist 2018-06-04 18:09:12 -06:00
Nicole Thomas
a46e42ab11
Merge pull request #47927 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-06-04 14:55:11 -04:00
Erik Johnson
9c369c6aa8
Remove temp logging from test 
It's now being logged in run_script itself
 2018-06-04 00:19:30 -05:00
Erik Johnson
fb66368af9
Update test logging for salt-jenkins 1000 2018-06-02 21:39:17 -05:00
rallytime
7e1d278d19
Update old utils paths to use new utils paths 2018-06-01 15:00:46 -04:00
rallytime
3273bbdab7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/modules/all/index.rst
  - doc/topics/grains/index.rst
  - doc/topics/releases/2016.3.4.rst
  - doc/topics/spm/spm_formula.rst
  - doc/topics/tutorials/cron.rst
  - doc/topics/tutorials/index.rst
  - doc/topics/tutorials/stormpath.rst
  - salt/engines/slack.py
  - salt/log/handlers/fluent_mod.py
  - salt/modules/cyg.py
  - salt/modules/junos.py
  - salt/modules/namecheap_dns.py
  - salt/modules/namecheap_domains.py
  - salt/modules/namecheap_ns.py
  - salt/modules/namecheap_ssl.py
  - salt/modules/namecheap_users.py
  - salt/modules/reg.py
  - salt/modules/tomcat.py
  - salt/modules/vault.py
  - salt/modules/win_file.py
  - salt/modules/zpool.py
  - salt/output/highstate.py
  - salt/renderers/pass.py
  - salt/runners/cache.py
  - salt/states/boto_apigateway.py
  - salt/states/boto_iam.py
  - salt/states/boto_route53.py
  - salt/states/msteams.py
  - salt/states/reg.py
  - salt/states/win_iis.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/states/test_user.py
  - tests/support/helpers.py
  - tests/unit/cloud/clouds/test_openstack.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/unit/modules/test_junos.py
  - tests/unit/pillar/test_git.py
  - tests/unit/states/test_win_path.py
  - tests/unit/test_pillar.py
  - tests/unit/utils/test_format_call.py
  - tests/unit/utils/test_utils.py
  - tests/unit/utils/test_warnings.py
 2018-06-01 14:54:12 -04:00
Erik Johnson
93ee5ee2b0
Fix all Sphinx warnings 
Well, all but one, which we expect to see
 2018-05-31 15:28:25 -05:00
Nicole Thomas
ae73cb3947
Merge pull request #47899 from terminalmage/salt-jenkins-1000 
salt-jenkins issue 1000
 2018-05-31 14:24:48 -04:00
Nicole Thomas
8f78e3aef6
Merge pull request #47753 from Ch3LL/service_mac 
Add stderr launchctl helper class and fix service mac tests
 2018-05-31 14:16:57 -04:00
Nicole Thomas
b4bac9b41b
Merge pull request #47868 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-30 17:20:37 -04:00
Nicole Thomas
63efb76d51
Merge pull request #47822 from Ch3LL/win_user_test 
Add user state integration tests to windows
 2018-05-30 17:13:06 -04:00
Ch3LL
185c9e9ae2
only stop service if its running 2018-05-30 15:35:05 -04:00
Ch3LL
e15e674955
Add stderr launchctl helper class and fix service mac tests 2018-05-30 15:30:24 -04:00
Ch3LL
3a691b405f
add user_home path for both windows and linux 2018-05-30 14:22:10 -04:00
Erik Johnson
25afc932f7
WIP salt-jenkins issue 1000 
This adds logging of the output and retcode when the output file fails
to be created. As I have thus far been unable to reproduce this locally,
this is the best shot at seeing what is causing the issue, since
ShellCase's run_script is rather opaque about what happens in the script
itself. We do know from the salt-runtests.log that the `salt-call -g` is
successfully returning, what we don't know is what happened after that
data was returned, and this should provide that insight.
 2018-05-30 11:40:51 -05:00
Frode Gundersen
38d114a2d2
add whoami test 2018-05-29 21:51:02 +00:00
rallytime
120ee16b70
Replace old utils paths with new utils paths 2018-05-29 11:19:34 -04:00
rallytime
dc32b67c03
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/win_snmp.py
  - tests/integration/modules/test_saltutil.py
  - tests/integration/states/test_pkg.py
  - tests/support/helpers.py
  - tests/support/runtests.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/whitelist.txt
 2018-05-29 11:14:39 -04:00
Gareth J. Greenaway
3e074be9c3
Fixing lint 2018-05-28 09:36:46 -07:00
Gareth J. Greenaway
02609b6e61
Adding state files for new test. 2018-05-28 09:36:46 -07:00
Gareth J. Greenaway
377e34c689
Updating function in saltmod to ensure that the result is a failure if the function being run returns as False. 2018-05-28 09:36:45 -07:00
Nicole Thomas
30b31c5db5
Merge pull request #47800 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-25 21:17:40 -04:00
Nicole Thomas
0bf651b470
Merge pull request #47846 from Ch3LL/p_refresh_test 
Fix flaky refresh pillar integration test
 2018-05-25 16:50:48 -04:00
Nicole Thomas
96b7c0cc76
Merge pull request #47778 from Ch3LL/win_state_pkg 
Add test_pkg integration state tests to windows
 2018-05-25 16:36:46 -04:00
Nicole Thomas
6f934c2259
Merge pull request #47823 from Ch3LL/win_dns_test 
Add win_dns module integration tests for windows
 2018-05-25 16:34:02 -04:00