Commit Graph

84839 Commits

Author SHA1 Message Date
Nicole Thomas
dbdef8230e
Merge pull request #45630 from bdrung/2017.7
Fix tests
2018-01-23 16:56:46 -05:00
Nicole Thomas
e5c9cd91e8
Merge pull request #45619 from garethgreenaway/2017_7_test_mac_user_enable_auto_login
[2017.7] Fixing test_mac_user_enable_auto_login
2018-01-23 16:56:03 -05:00
Nicole Thomas
8a95fc4257
Merge pull request #45644 from twangboy/win_fix_dep_warns
Add missing space to deprecation warning
2018-01-23 16:55:10 -05:00
Nicole Thomas
c290b6320b
Merge pull request #45634 from Ch3LL/mac-service
Add different service name for Mac 10.13 test
2018-01-23 16:51:56 -05:00
Nicole Thomas
c28151f5f7
Merge pull request #45606 from terminalmage/salt-ssh-root-dir-fix
Fix bug affecting salt-ssh when root_dir differs from the default
2018-01-23 15:03:48 -05:00
twangboy
de9bc384cc
Add missing space to deprecation warning 2018-01-23 13:01:50 -07:00
Nicole Thomas
0931b6417d
Merge pull request #45636 from Ch3LL/mac-tests
Fix mac service and pkg tests for 10.13
2018-01-23 13:44:55 -05:00
Ch3LL
df0ad54c9a
remove unnecessary variable for test 2018-01-23 11:47:32 -05:00
Ch3LL
acb14fd43d
fix pylint 2018-01-23 11:42:49 -05:00
Ch3LL
a9b12cd1ea
Fix mac service and pkg tests for 10.13 2018-01-23 11:39:06 -05:00
Ch3LL
31b712e27d
Add different service name for Mac 10.13 test 2018-01-23 10:07:10 -05:00
Benjamin Drung
76d44e9490 Fix skipping test when boto is not installed
When boto and moto are not installed, the BotoVpcTestCaseBase() should
be skipped. _get_boto_version() and _get_moto_version() require that
boto and moto are installed, but are called anyway in the skipIf
condition.
2018-01-23 13:32:22 +01:00
Benjamin Drung
2b9b262357 Fix unit.modules.test_cmdmod.CMDMODTestCase.test_run
The test_run unit tests end result when a command is not found. When
_run() is called without setting cwd, it will use the home directory as
working directory. When the home directory does not exist, the unit test
will fail:

Traceback (most recent call last):
  File "tests/unit/modules/test_cmdmod.py", line 231, in test_run
    ret = cmdmod._run('foo', use_vt=True).get('stderr')
  File "salt/modules/cmdmod.py", line 536, in _run
    .format(cwd)
salt.exceptions.CommandExecutionError: Specified cwd
'/sbuild-nonexistent' either not absolute or does not exist

Therefore set cwd to the current directory since the working directory
is not used in this test case.

This fixes one failing test of #45627.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2018-01-23 13:18:18 +01:00
Gareth J. Greenaway
f5f03e1e6c
Fixing integration.modules.test_mac_user.MacUserModuleTest.test_mac_user_disable_auto_login 2018-01-22 14:10:23 -08:00
Nicole Thomas
63a294f498
Merge pull request #45609 from rallytime/merge-2017.7
[2017.7] Merge forward from 2017.7.3 to 2017.7
2018-01-22 15:24:35 -05:00
Nicole Thomas
59329957ca
Merge pull request #45576 from zer0def/boto3-route53-typo
Fixed boto3_route53 execution module function signature `diSassociate_vpc_from_hosted_zone` typo. (refs #45431)
2018-01-22 14:37:12 -05:00
rallytime
a5fc3b3363
Merge branch '2017.7.3' into '2017.7'
No conflicts.
2018-01-22 11:55:54 -05:00
Nicole Thomas
ced3269ae8
Merge pull request #45604 from rallytime/bp-45582
Back-port #45582 to 2017.7.3
2018-01-22 11:54:14 -05:00
Erik Johnson
3f9309521b
Fix bug affecting salt-ssh when root_dir differs from the default
H/T https://github.com/saltstack/salt/issues/44957#issuecomment-356122811
2018-01-22 08:58:52 -06:00
rallytime
bc8a450cc7
Remove state.py utils file from thin list
It doesn't exist in 2017.7
2018-01-22 08:53:25 -05:00
Erik Johnson
629e6c9674
Further fixes to for salt-ssh test under heavy load
This makes some further tweaks to make the test more stable under heavy
load. Firstly, the background job sleeps longer, and secondly, we make
up to 3 attempts run state.running instead of just the one, in case our
first attempt was too early. It also uses threading to make the job
sleep, since the method of adding a & to the command seemed to be
producing intermittent failures with returning clean JSON.
2018-01-22 07:33:42 -05:00
Erik Johnson
0dff596b59
Add salt/utils/state.py to thin tarball
This is required since some of the code in salt/modules/state.py was
moved into salt/utils/state.py so it could be reused.
2018-01-22 07:33:42 -05:00
Erik Johnson
a61afda100
Pass on OSError if thin tarball already removed
This can happen in the test suite while running
integration.ssh.test_state.SSHStateTest.test_state_running because the
instance of salt-ssh running in the background has completed during the
second salt-ssh run, and since the contents of the thin tarball haven't
changed between runs, the checksum used to derive the path of the thin
tarball hasn't changed, so it is unlinked before the 2nd salt-ssh run in
that test completes.
2018-01-22 07:33:41 -05:00
Daniel Wallace
4672baa6c8
Merge pull request #45591 from gtmanfred/2017.7.3
mark minion_blackout tests as flaky
2018-01-21 17:14:30 -07:00
Daniel Wallace
2a992f9017
Merge pull request #45585 from rallytime/bp-45579
Back-port #45579 to 2017.7.3
2018-01-21 17:13:58 -07:00
Daniel Wallace
f7fd35fc4a
test updating the minion blackout timeout to 10 seconds 2018-01-21 14:42:56 -07:00
rallytime
0292c8345b
Lint fix: use six's map 2018-01-21 15:23:27 -05:00
rallytime
108d8cbeef
Use correct utils path for 2017.7 2018-01-21 13:01:21 -05:00
Erik Johnson
a38f4cb6d6
Restrict pyzmq optimizations to pyzmq >= 14.3.0
The optimizations added in 00f31bf cause problems with older ZMQ
versions.
2018-01-21 08:50:26 -05:00
Erik Johnson
58ad558346
Fix event unpack 2018-01-21 08:46:22 -05:00
Nicole Thomas
19cd97ed3b
Merge pull request #45573 from gtmanfred/2017.7.3
update 2017.7.3 tests
2018-01-20 15:05:12 -05:00
zer0def
21e1e9e226 Fixed boto3_route53 execution module function signature diSassociate_vpc_from_hosted_zone typo. (refs #45431) 2018-01-20 20:47:17 +01:00
Daniel Wallace
bd3cb47fa7
fix mock for opensuse
Opensuse needs a run_all in here, mock it so we don't see an error, and still
test the docker stuff
2018-01-20 09:58:22 -07:00
Daniel Wallace
808e26e69a
test simple website 2018-01-20 09:57:20 -07:00
Nicole Thomas
e72d81ef22
Merge pull request #45570 from gtmanfred/2017.7.3
Fix tests for 2017.7.3
2018-01-20 10:01:20 -05:00
Daniel Wallace
1f71f301ba
specify checking man page path
Without setting the man path, this would be checking that the installed salt
package used to bootstap has an spm man page, which is possible that it
doesn't, and also not what we want to check
2018-01-19 17:53:20 -07:00
Daniel Wallace
2ddbcb45c1
fix pkg_resources for usage with testing pip
We do weird things with the pip modules for salt-jenkins, we need to directly
import the module instead of a function from the module for the namespacing we
do there to work.
2018-01-19 16:44:08 -07:00
Daniel Wallace
0ba39a7108
switch systemd-journald for sshd for arch service test
the running tests run second because of alphabetical order, and stopping sshd
does not kill off the running connection, so we know that sshd has to be on
arch for us to connect, so stop it with dead and start it back with running.

It is also not possible to stop the systemd-journald process without shutting
down the full machine.
2018-01-19 15:17:53 -07:00
Nicole Thomas
42b0d27f71
Merge pull request #45552 from rallytime/merge-2017.7-from-.3
[2017.7] Merge forward from 2017.7.3 to 2017.7
2018-01-19 14:12:48 -05:00
Nicole Thomas
879cfcb889
Merge pull request #45551 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2018-01-19 13:21:26 -05:00
rallytime
dba7410b80
Merge branch '2017.7.3' into '2017.7'
No conflicts.
2018-01-19 10:11:45 -05:00
rallytime
e0ffa32b49
Merge branch '2016.11' into '2017.7'
Conflicts:
  - tests/integration/modules/test_pkg.py
2018-01-19 10:09:36 -05:00
Nicole Thomas
7bc60c56d4
Merge pull request #45538 from gtmanfred/2017.7.3
Backport test fixes to 2017.7.3
2018-01-19 09:39:43 -05:00
Nicole Thomas
18e814a7bb
Merge pull request #45540 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.11.9 to 2016.11
2018-01-19 09:19:45 -05:00
Daniel Wallace
801e0639b6
Merge branch '2017.7.3' into 2017.7.3 2018-01-18 17:49:19 -07:00
Nicole Thomas
28554ca935
Merge pull request #45389 from DSRCorporation/bugs/42626_pub_acl_doc
Docs update for function args limit in pub acl.
2018-01-18 17:56:10 -05:00
Nicole Thomas
b3dc758ab0
Merge pull request #45483 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2018-01-18 17:54:11 -05:00
Nicole Thomas
8ad65e3359
Merge pull request #45533 from rallytime/bp-45529
Back-port #45529 to 2017.7.3
2018-01-18 17:52:28 -05:00
rallytime
441f819b7b
Merge branch '2016.11.9' into '2016.11'
No conflicts.
2018-01-18 17:49:26 -05:00
Nicole Thomas
654df0f526
Merge pull request #45532 from gtmanfred/2016.11.9
fix mock for opensuse
2018-01-18 17:48:29 -05:00