Mike Place
2295d4df39
Merge pull request #45579 from terminalmage/test-suite-stability
...
Test suite stability fixes
2018-01-20 16:15:47 -07:00
Erik Johnson
34db948300
Restrict pyzmq optimizations to pyzmq >= 14.3.0
...
The optimizations added in 00f31bf
2018-01-20 16:44:46 -06:00
Erik Johnson
62117d0021
Fix event unpack
2018-01-20 14:24:22 -06: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
Erik Johnson
dd8599309b
Fix arg order in log message
...
When str.format() was removed from this log message in 685bfbb
2018-01-20 13:23:57 -06: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
b33df7dadd
Merge pull request #45480 from terminalmage/str-environ
...
aptpkg: force additional environment variables to be str types
2018-01-20 10:31:22 -05: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
twangboy
5f59c1573e
Fix issue caused by unicode literals
2018-01-19 22:58:06 +00: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
twangboy
8f2332f45c
Mock sys.platform so the test runs on Windows
2018-01-19 22:15:13 +00:00
twangboy
a9212f9927
remove regex_path variable
2018-01-19 21:37:20 +00:00
twangboy
fe9b35181a
Fix regex statement
...
The path seperator in Windows is an escape character in regex
2018-01-19 21:28:01 +00:00
Nicole Thomas
4fdb5cb135
Merge pull request #45419 from garethgreenaway/oxygen_updating_utils_for_unicode_round_three
...
[oxygen] Oxygen updating utils and related tests for Unicode round three
2018-01-19 16:23:56 -05:00
Erik Johnson
4176f4cbd9
aptpkg: force additional environment variables to be str types
...
This prevents tracebacks in subprocess due to unicode values in
the dict merged into os.environ via the module's __init__ func.
2018-01-19 15:23:16 -06:00
Nicole Thomas
061c7e3bcb
Merge pull request #45536 from twangboy/win_fix_test_configparser
...
Fix `unit.utils.test_configparser` for Windows
2018-01-19 15:14:58 -05: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
Nicole Thomas
4cfc66ad57
Merge branch 'oxygen' into oxygen_updating_utils_for_unicode_round_three
2018-01-19 10:21:37 -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
bef1e070aa
Merge pull request #45338 from twangboy/win_fix_test_ansiblegate
...
Fix `unit.modules.test_ansiblegate` for Windows
2018-01-19 09:21:38 -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
31111ef734
Merge pull request #45534 from twangboy/win_fix_test_crypt
...
Fix `unit.test_crypt` for Windows
2018-01-18 17:53:09 -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
Daniel Wallace
8d907ee1a0
fix moto version
...
Fixes saltstack/salt-jenkins#692
2018-01-18 14:56:31 -07:00
Daniel Wallace
1241ab5fc6
fix test boto imports
...
Test boto imports are failing for some reason
2018-01-18 14:56:27 -07:00
Daniel Wallace
f4b6367cf9
fix fedora pkg test
...
yum is no longer installed by default on fedora. apparently it has been
removed from the base installs, and only dnf is available. Stop depending on
the pkg manager, and just use bash.
2018-01-18 14:54:54 -07:00
twangboy
93aec6fbd9
Fix decode issue on Py2, Use os.linesep
2018-01-18 20:45:40 +00:00
twangboy
50859057ed
Skip tests on Windows, gate module on Windows
2018-01-18 13:27:56 -07:00
twangboy
176d3aab62
Revert one more indent
2018-01-18 13:27:56 -07:00
twangboy
38c2ce2fa0
Revert indents
2018-01-18 13:27:55 -07:00
twangboy
f72e7c28f2
Revert imports
2018-01-18 13:27:55 -07:00
twangboy
fbb4e712e7
revert changes to unittest
2018-01-18 13:27:55 -07:00
twangboy
3126af7661
Fix patch indenting, remove :returns:
2018-01-18 13:27:55 -07:00
twangboy
18bc68939c
Fix broken tests, use correct assert functions
2018-01-18 13:27:54 -07:00
twangboy
2dea2f16a9
Remove salt.utils.platform import
2018-01-18 19:13:33 +00:00
twangboy
2859be5d57
Fix mock, fix paths
2018-01-18 19:07:50 +00:00
Ch3LL
6d56c64d88
Fix UnboundLocalError for pacman pkg installs
2018-01-18 14:03:14 -05:00
Nicole Thomas
5e26282843
Merge pull request #45529 from Ch3LL/pacman-sources
...
Fix UnboundLocalError for pacman pkg installs
2018-01-18 14:01:48 -05:00
