valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
90,464 Commits 24 Branches 182 Tags 341 MiB
e83490032d
Commit Graph

12299 Commits

Author SHA1 Message Date
Nicole Thomas
1c079f7c4c
Merge pull request #45677 from twangboy/win_fix_test_saltclass 
Fix `unit.pillar.test_saltclass` for Windows
 2018-01-25 10:08:08 -05:00
Nicole Thomas
16e4b5b57d
Merge pull request #45676 from terminalmage/ubuntu14-test-fixes 
Ubuntu 14 test fixes
 2018-01-25 09:57:50 -05:00
twangboy
317146537c
Fix paths 2018-01-25 00:43:43 +00:00
Nicole Thomas
10ce809123
Merge pull request #44903 from rallytime/raising-auth-errors 
Distinguish between Authorization and Authentication errors
 2018-01-24 17:12:38 -05:00
Nicole Thomas
2a562243b6
Merge pull request #45541 from terminalmage/py3-tier1 
[PY3] Add unicode_literals to high-priority modules/states
 2018-01-24 16:54:24 -05:00
Erik Johnson
fc92a30f7b
Ubuntu 14 test fixes 
This fixes failures which were identified in Ubuntu 14 Jenkins PR builds
 2018-01-24 15:39:08 -06:00
Nicole Thomas
36c4db07e0
Merge pull request #45578 from rallytime/unicode-changes-3 
Add unicode_literals to even more modules and states
 2018-01-24 16:33:33 -05:00
Nicole Thomas
66a38a1c61
Merge pull request #45601 from DSRCorporation/bugs/unicode_3 
Salt Unicode Update 3rd tier 3rd bunch from DK
 2018-01-24 16:32:29 -05:00
rallytime
9f78e53d4b
Merge branch '2017.7.3' into '2017.7' 
No conflicts.
 2018-01-24 16:09:17 -05:00
Nicole Thomas
b9b3e2e37e
Merge pull request #45610 from terminalmage/kill-six.b-with-fire 
Replace all usage of six.b
 2018-01-24 14:22:06 -05:00
rallytime
15043fd2e3
Fixup remaining test failures 2018-01-24 14:18:02 -05:00
rallytime
a7460cebc6
Lint fixes 2018-01-24 14:07:46 -05:00
Dmitry Kuzmenko
8916b91aa8
Fixed unit tests. 2018-01-24 20:37:11 +03:00
Nicole Thomas
012935892b
Merge pull request #45658 from terminalmage/tests 
Several oxygen test fixes
 2018-01-24 12:13:44 -05:00
Erik Johnson
9c86cd627a
[PY3] Add unicode_literals to high-priority modules/states 2018-01-24 10:33:58 -06:00
Nicole Thomas
5a5e780b72
Merge pull request #45566 from twangboy/win_fix_test_docker 
Fix `unit.utils.test_docker` for Windows
 2018-01-24 11:31:18 -05:00
Erik Johnson
4a6ab729dd
Fix failing pkg integration tests for releases with no '.' 
Fedora releases are integers, and Arch's osrelease is simply `rolling`,
so https://github.com/saltstack/salt/pull/45636 caused these tests to
regress. This fixes them by moving the osrelease check until after the
MacOS check.

It also fixes the windows check, which would _always_ evaluate to `True`
since it was not calling the function. Therefore, the `if` would just be
a simple boolean which would resolve to `True` since it was just checking
a function reference.
 2018-01-24 10:13:22 -06:00
Daniel Wallace
e827947878
Merge pull request #45618 from terminalmage/os.walk 
Fix salt.utils.path.os_walk for certain Python 2 versions
 2018-01-24 08:54:32 -07:00
Erik Johnson
d6d7da5c90
Replace all usage of six.b 
It can't be trusted to produce bytes, it returns unicode when a unicode
string is passed.
 2018-01-24 09:17:28 -06:00
Nicole Thomas
7934372b7b
Merge pull request #45649 from rallytime/bp-45634 
Back-port #45634 to 2017.7.3
 2018-01-24 09:59:42 -05:00
Nicole Thomas
fa373e658e
Merge pull request #45476 from rallytime/unicode-h 
Add unicode_literals to modules, states, tests (H)
 2018-01-24 09:15:40 -05:00
Nicole Thomas
d5cedf6d81
Merge pull request #45560 from rallytime/unicode-changes-1 
Add unicode_literals to modules, states, and related tests
 2018-01-24 09:13:58 -05:00
Nicole Thomas
e6e977c6a0
Merge branch 'oxygen' into win_fix_test_docker 2018-01-24 09:13:28 -05:00
Nicole Thomas
a5abe5be68
Merge pull request #45594 from garethgreenaway/tier_three_unicode_modules_state_updates 
[oxygen] Tier three Unicode modules state updates
 2018-01-24 09:12:01 -05:00
Nicole Thomas
189c133ebc
Merge branch 'oxygen' into bugs/unicode_3 2018-01-24 09:11:23 -05:00
Erik Johnson
b5ef58c2aa
Fix salt.utils.path.os_walk for certain Python 2 versions 
This helper was designed to ensure that the paths returned were all
unicode types, but on a couple platforms having the path be a unicode
type causes a traceback deep in the stdlib within posixpath.

To work around this, this commit makes the helper a generator that
simply decodes each tuple returned from os.walk as we iterate.
 2018-01-23 23:03:17 -06:00
Erik Johnson
21918efb5e
Update test to reflect unicode_literals 2018-01-23 19:34:25 -06:00
Erik Johnson
469d8e6e52
Fix difference between CSafeDumper and Dumper in yaml serializer test 2018-01-23 19:34:25 -06:00
Erik Johnson
458fdc326c
Increase timeout for orchestration test 
This orch test takes longer on some test VM images than others.
 2018-01-23 19:34:23 -06:00
Erik Johnson
0a6b06d8ea
Fix unnecessary/incorrect usage of six.binary_type 2018-01-23 17:54:27 -05:00
Nicole Thomas
79ee24c0c7
Merge pull request #45611 from terminalmage/tests-log-level 
Fix unnecessary/incorrect usage of six.binary_type
 2018-01-23 17:53:19 -05:00
Nicole Thomas
fc18995873
Merge pull request #45438 from terminalmage/py3-salt.utils-t-v 
[PY3] Add unicode_literals to salt.utils modules (T-V)
 2018-01-23 17:14:16 -05:00
Nicole Thomas
4423989ac8
Merge pull request #45587 from DSRCorporation/bugs/unicode_2 
Salt Unicode Update 3rd tier 2nd bunch from DK
 2018-01-23 17:08:59 -05:00
rallytime
fb4f2dd0fa
Distinguish between Authorization and Authentication errors 
And handle the error distiction being returned from the publish function
instead of sending empty strings.
 2018-01-23 17:05:22 -05:00
Nicole Thomas
4a116beba6
Merge pull request #45639 from rallytime/merge-oxygen 
[oxygen] Merge forward from 2017.7 to oxygen
 2018-01-23 17:03:26 -05:00
Nicole Thomas
0a07e0d259
Merge pull request #45642 from rallytime/bp-45636 
Back-port #45636 to 2017.7.3
 2018-01-23 17:00:29 -05:00
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
Ch3LL
1c78fc23ea
Add different service name for Mac 10.13 test 2018-01-23 16:53:06 -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
rallytime
54e154b62f
Fix test errors created with unicode changes 
- jboss_cli test: reduce test complication by not mixing raw and \u
- remove one test from test_junos: it's not really testing anything since it's heavily mocked
 2018-01-23 15:48:42 -05:00
rallytime
637ec36739
Fix state unit tests for kernelpkg 2018-01-23 15:26:26 -05:00
rallytime
ca946886f0
Lint fix 2018-01-23 15:26:26 -05:00
rallytime
c08c67f3d4
Add unicode_literals to modules, states, and related tests 2018-01-23 15:26:25 -05:00
Gareth J. Greenaway
49d0d1f1a5
Updating various modules, states and related tests for Unicode fun & profit part one. 2018-01-23 11:53:16 -08:00
Frode Gundersen
e6917a291e
fix test_archive test for mac on 2017.7 branch 2018-01-23 14:35:32 -05: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
rallytime
583a89ca6f
Update old utils paths to new paths 2018-01-23 13:34:24 -05:00
rallytime
3c298afa72
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/modules/pip.py
  - salt/modules/reg.py
  - salt/modules/win_pkg.py
  - salt/runners/manage.py
  - salt/states/pkg.py
  - salt/transport/zeromq.py
  - salt/utils/event.py
  - tests/integration/modules/test_pip.py
  - tests/integration/states/test_user.py
  - tests/unit/grains/test_core.py
  - tests/unit/states/test_archive.py
  - tests/unit/utils/test_boto.py
 2018-01-23 13:26:43 -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
rallytime
10b7b0601d
Add unicode_literals to more modules, states, and tests 2018-01-23 10:08:59 -05:00
Ch3LL
31b712e27d
Add different service name for Mac 10.13 test 2018-01-23 10:07:10 -05:00
rallytime
a35cf9ca1e
Add unicode_literals to modules, states, tests (H) 2018-01-23 09:55:46 -05:00
Nicole Thomas
9facc5ede5
Merge pull request #45543 from terminalmage/py3-tier1-2 
[PY3] Add unicode_literals to more high-priority states/modules
 2018-01-23 09:38:21 -05:00
Nicole Thomas
a8dabbc150
Merge branch 'oxygen' into bugs/unicode_2 2018-01-23 07:56:21 -05:00
Nicole Thomas
0e50abd7f7
Merge pull request #45593 from rallytime/unicode-changes-6 
Add unicode_literals to modules/states [z]
 2018-01-23 07:52:03 -05:00
Nicole Thomas
ff997aa552
Merge pull request #45592 from rallytime/unicode-changes-5 
Add unicode_literals to modules, states, and tests [n]
 2018-01-23 07:50:46 -05:00
Nicole Thomas
5c907ebb15
Merge pull request #45586 from rallytime/unicode-changes-4 
Add more unicode_literals to modules, states, and test files
 2018-01-23 07:49:55 -05:00
Nicole Thomas
2cf7a806bc
Merge pull request #45557 from DSRCorporation/bugs/unicode_1 
Salt Unicode Update 3rd tier 1st bunch from DK
 2018-01-23 07:48:11 -05:00
Nicole Thomas
453401a9a0
Merge pull request #45621 from terminalmage/py3-fix-salt.utils.json 
salt.utils.json: only encode data on PY2
 2018-01-23 07:42:49 -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
Erik Johnson
ba54ff44a6
add tests for json load/dump helpers 2018-01-22 20:16:59 -06: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
98e2d66809
Merge pull request #45567 from twangboy/win_fix_test_process 
Fix `unit.utils.test_process` on Windows
 2018-01-22 14:50:05 -05:00
Nicole Thomas
d066e75473
Merge pull request #45568 from twangboy/win_fix_test_schema 
Fix `unit.utils.test_schema` for Windows/Py2
 2018-01-22 14:46:23 -05:00
Nicole Thomas
af033f1c93
Merge pull request #45549 from rallytime/unicode-i 
Add unicode_literals to modules, states, tests (I)
 2018-01-22 14:40:11 -05:00
Erik Johnson
6aa865cf54
Fix unnecessary/incorrect usage of six.binary_type 2018-01-22 11:17:06 -06:00
rallytime
a5fc3b3363
Merge branch '2017.7.3' into '2017.7' 
No conflicts.
 2018-01-22 11:55:54 -05:00
Dmitry Kuzmenko
e119b7c55a
Fixed lint failures 2018-01-22 17:59:17 +03:00
rallytime
33a36d5433
Add unicode_literals to modules/states [z] 2018-01-22 09:57:08 -05:00
rallytime
8d54b95d8c
Add unicode_literals to modules, states, and tests [n] 2018-01-22 09:42:15 -05:00
Erik Johnson
3d3a63d237
Update tests for vmware utils 
These were missed when updating the tests for utils T-V
 2018-01-22 08:41:54 -06:00
Erik Johnson
ed530a35ad
[PY3] Add unicode_literals to salt.utils modules (T-V) 2018-01-22 08:41:52 -06:00
rallytime
2e8b86a944
Add more unicode_literals to modules, states, and test files 2018-01-22 09:32:29 -05:00
Erik Johnson
06ec8db7e2
[PY3] Add unicode_literals to more high-priority states/modules 2018-01-22 08:26:28 -06:00
Nicole Thomas
e9c7faa357
Merge pull request #45466 from rallytime/unicode-e 
Add unicode_literals to modules, states, tests (E)
 2018-01-22 08:57:30 -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
Nicole Thomas
d48230a9e6
Merge pull request #45582 from terminalmage/salt-ssh-fixes 
Two salt-ssh fixes
 2018-01-22 07:31:43 -05:00
Nicole Thomas
4260d55a62
Merge pull request #45595 from terminalmage/fix-boto-tests 
Fix failing boto/network tests
 2018-01-22 07:30:15 -05:00
Dmitry Kuzmenko
9b09d1b2c9
Salt Unicode Update 3rd tier 3rd bunch from DK 2018-01-22 14:38:49 +03:00
Dmitry Kuzmenko
3ee328a28c
Salt Unicode Update 2018-01-22 14:38:24 +03:00
Dmitry Kuzmenko
06d3351f13
Salt Unicode Update 2018-01-22 14:38:01 +03:00
Erik Johnson
2817101041
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-21 21:19:53 -06:00
Nicole Thomas
fc0af9b2cf
Merge pull request #45491 from terminalmage/py3-encode-decode 
Improve PY3 compatibility of salt.utils.data.decode and encode
 2018-01-21 19:10:56 -05:00
Erik Johnson
033f34ee21
Fix failing boto/network tests 
These failures were recently introduced but went undiscovered due to
some recent instability in the test suite (which has now been fixed).

This commit fixes these failing tests.
 2018-01-21 17:24:11 -06:00
Nicole Thomas
37f60b1a4b
Merge branch 'oxygen' into unicode-e 2018-01-21 17:56:39 -05:00
Nicole Thomas
be36ee8749
Merge branch 'oxygen' into win_fix_test_process 2018-01-21 17:54:55 -05:00
Nicole Thomas
1a25ceca65
Merge pull request #45531 from terminalmage/py3-pkg 
[PY3] Add unicode_literals to pkg/pkgrepo states/modules
 2018-01-21 17:52:41 -05:00
Nicole Thomas
ccefc34a79
Merge pull request #45361 from terminalmage/py3-fileserver 
[PY3] Update fileserver for Unicode/PY3 compatibility
 2018-01-21 17:51:13 -05:00
Daniel Wallace
f7fd35fc4a
test updating the minion blackout timeout to 10 seconds 2018-01-21 14:42:56 -07:00
rallytime
9effd08bb3
Add unicode_literals to modules, states, tests (I) 2018-01-21 09:27:14 -05:00
rallytime
4b47e8e75a
Add unicode_literals to modules, states, tests (E) 2018-01-21 09:25:58 -05:00
Erik Johnson
2926834423
Improve robustness of daemons unit tests 
https://github.com/saltstack/salt/pull/45583 was opened to fix some test
failures in the daemons tests. However, with the way that the tests were
written, `_multiproc_exec_test` was waiting for a response from the
child function, which would never come due to the error raised during
the test. This means that any exception raised during the test would
stop the test suite dead in its tracks, causing it to eventually end in
a timeout.

This commit addresses this design flaw by wrapping the test logic in a
try/except, and ensuring that we always return a response from the child
function. The tests will instead log the exception and gracefully fail
the test, allowing whomever troubleshoots the failures to consult the
salt-runtests.log to see the traceback.
 2018-01-20 22:49:02 -06:00
Erik Johnson
c27bb7c116
[PY3] Update fileserver for Unicode/PY3 compatibility 
This adds a unicode_literals import to the fileserver code, and also ensures
that we return unicode paths from the serialized file/env list caches
(which when deserialized are still encoded str types on PY2).

It also adds a test and modifies a few other existing tests to confirm
that unicode paths/envs are returned *as unicode* in the return data.
 2018-01-20 22:25:23 -06:00
Erik Johnson
441e9dabd1
Improve PY3 compatibility of salt.utils.data.decode and encode 
This adds the ability to specify the encoding and error behavior. It
also adds the "errors" argument to the salt.utils.stringutils funcs for
converting between str, unicode, and bytes.

Tests have also been updated to properly test the recursive behavior of
salt.utils.data.decode/encode.
 2018-01-20 22:22:34 -06:00
Erik Johnson
9df3dab883
[PY3] Add unicode_literals to pkg/pkgrepo states/modules 2018-01-20 22:21:41 -06:00
Erik Johnson
83acd43294
Fix mocked logger in daemons tests 
This was not caught when the daemons had their logging switched to using
string formatting instead of str.format()
 2018-01-20 22:09:54 -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
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
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
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
4cfc66ad57
Merge branch 'oxygen' into oxygen_updating_utils_for_unicode_round_three 2018-01-19 10:21:37 -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
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
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
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
Daniel Wallace
6c26025664
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-18 10:48:07 -07:00
Nicole Thomas
33e81c7cbf
Merge pull request #45515 from twangboy/win_fix_test_jinja 
Fix `unit.templates.test_jinja` for Windows
 2018-01-18 11:01:49 -05:00
Nicole Thomas
8123025a3b
Merge pull request #45512 from terminalmage/py3-b 
[PY3] Update modules/states for PY3/Unicode compatibility (B)
 2018-01-18 10:53:58 -05:00
Nicole Thomas
bd891ee13a
Merge pull request #45405 from garethgreenaway/oxygen_updating_utils_for_unicode_round_one 
[oxygen] Updating various utils and related tests for Unicode goodness.
 2018-01-18 10:39:55 -05:00
Daniel Wallace
5455d2dee6
fix centos 6 pip test 
flake8 is having problems installing on python2.6, switching to different
module that still works easily on python 2.6
 2018-01-17 22:41:06 -07:00
Daniel Wallace
40255194b0
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-17 21:35:41 -07:00
Erik Johnson
e0890baa31
Use correct attribute in test_log_created 2018-01-17 19:54:47 -06:00
Erik Johnson
2ab1e71ef2
[PY3] Add unicode_literals to salt.utils modules (P) 2018-01-17 19:54:44 -06:00
twangboy
4517ca72b9
Ensure utf-8 encoding 2018-01-17 16:22:44 -07:00
Erik Johnson
4ca7931655
[PY3] Update modules/states for PY3/Unicode compatibility (B) 
This includes all the boto modules
 2018-01-17 17:06:07 -06:00
Gareth J. Greenaway
f724c579d2
Merge branch 'oxygen' into oxygen_updating_utils_for_unicode_round_one 2018-01-17 12:51:38 -08:00
Gareth J. Greenaway
a68ff09084
Merge branch 'oxygen' into oxygen_updating_utils_for_unicode_round_three 2018-01-17 12:51:34 -08:00
Frode Gundersen
ccf062d62e
fix test_archive test for mac on 2017.7 branch 2018-01-17 18:54:35 +00:00
rallytime
de6d85959a
Lint fix 2018-01-17 12:42:38 -05:00
Nicole Thomas
12a899cfb9
Merge pull request #45463 from rallytime/fix-unit-file-test 
Change "to_str" to "to_bytes": needed when opening a file in bytes mode
 2018-01-17 12:38:11 -05:00
Gareth J. Greenaway
a773ff90e5
More unicode changes. Adding print_function to all files. Updating various reads & writes to files. 2018-01-17 09:03:14 -08:00
Gareth J. Greenaway
a79112cc91
Updating more utils and tests for Unicode goodness 2018-01-17 09:03:14 -08:00
Gareth J. Greenaway
e14b655c01
More unicode changes. Adding print_function to all files. Updating various reads & writes to files. 2018-01-17 09:02:17 -08:00
Gareth J. Greenaway
db41d9b303
Updating various utils and related tests for unicode goodness. 2018-01-17 09:02:17 -08:00
Nicole Thomas
4803fef51a
Merge pull request #44648 from isbm/isbm-bsc1068446-develop 
DoubleBugfix: a) errors in external pillar causes crash, b) highstate crashes on certain SLS scenarios
 2018-01-17 10:58:34 -05:00
Bo Maryniuk
29b67b3b18 Refactor unit tests so they call class-based decorator 2018-01-17 14:13:25 +01:00
rallytime
9f547a31f0
Merge branch '2016.11' into '2017.7' 2018-01-16 17:19:08 -05:00
Nicole Thomas
5f58a87e84
Merge pull request #45365 from meaksh/2017.7-issue-45345 
Return an error when "gid_from_name" is set but group does not exist
 2018-01-16 13:31:49 -05:00
Bo Maryniuk
dbe7c01ed6 Update integration test: docs, add more checks, rename 2018-01-16 18:13:00 +01:00
rallytime
9e7aeb5e02
Change "to_str" to "to_bytes": needed when opening a file in bytes mode 
References: https://github.com/saltstack/salt/pull/45357
 2018-01-16 10:41:46 -05:00
Nicole Thomas
de080983e3
Merge pull request #44822 from frogunder/pkg_latestversion 
add pkg_latest_version test
 2018-01-16 09:16:53 -05:00
rallytime
590a6db626
Lint: use support TMP path instead of integration TMP path 2018-01-16 09:13:27 -05:00
Bo Maryniuk
d0c54f43cc Git rebase spaghetti fix 2018-01-15 15:36:06 +01:00
Bo Maryniuk
5ca5046822 Refactor and rename tests while function has been renamed 2018-01-15 15:34:46 +01:00
Bo Maryniuk
6802593a5a Lintfix: E8302 2018-01-15 15:34:13 +01:00
Bo Maryniuk
1133e0c35d Lintfix: W0611 2018-01-15 15:34:13 +01:00
Bo Maryniuk
b3c3b8c679 Lintfix: E0102 2018-01-15 15:34:13 +01:00
Bo Maryniuk
a228ed5ddf Add unit test to unify result converted to false 2018-01-15 15:34:13 +01:00
Bo Maryniuk
48b9a70901 Fix unit test docstring 2018-01-15 15:33:49 +01:00
Bo Maryniuk
8de1301e2d Add unit test for result is converted to a True boolean type 2018-01-15 15:33:49 +01:00
Bo Maryniuk
4e9a5b8033 Fix docstrings 2018-01-15 15:33:21 +01:00
Bo Maryniuk
d9b4ac2d6d Test only comment section conversion 2018-01-15 15:33:21 +01:00
Bo Maryniuk
ac63d35703 Remove leftovers of the old unit test 2018-01-15 15:24:46 +01:00
Bo Maryniuk
e09c21bb8d Add unit test to unify an output data from the state 2018-01-15 15:24:46 +01:00
Bo Maryniuk
a976d1445e Add unit test to ensude there is "name", "result" and "comment" in the state output. 2018-01-15 15:24:20 +01:00
Bo Maryniuk
a9ba5a3fe3 Add unit test checking the entire return is of a dictionary type 2018-01-15 15:23:44 +01:00
Bo Maryniuk
014167c640 Add unit test for checking policy so the "changes" keyword contains a dictionary type 2018-01-15 15:23:08 +01:00
Bo Maryniuk
5902633b3f Remove obsolete unit test code 2018-01-15 15:21:19 +01:00
Bo Maryniuk
fa96d8c528 Use PyTest in tests 2018-01-15 15:20:51 +01:00
Bo Maryniuk
0949c39271 Add unit test for _get_pillar_errors when external pillar has errors and internal is clean 2018-01-15 15:20:50 +01:00
Bo Maryniuk
6ed4262589 Add unit test for _get_pillar_errors when external and internal pillars are clean 2018-01-15 15:20:50 +01:00
Nicole Thomas
53b25752a4
Merge branch 'oxygen' into py3-cache-cli 2018-01-14 16:35:59 -05:00
Erik Johnson
919e92c911
Fix git.latest failure when rev is not the default branch 2018-01-14 08:25:30 -05:00
Erik Johnson
c081b2c62c
Fix git.latest failure when rev is not the default branch 2018-01-14 08:23:38 -05:00
Nicole Thomas
c00fddd5bb
Merge pull request #45357 from twangboy/win_fix_test_file 
Fix `unit.modules.test_file` for Windows
 2018-01-14 08:14:24 -05:00
Nicole Thomas
e8e82f2f7f
Merge pull request #45429 from terminalmage/py3-salt.utils-r-s 
[PY3] Add unicode_literals to salt.utils modules (R-S)
 2018-01-14 08:06:51 -05:00
Nicole Thomas
80f6815c11
Merge pull request #45439 from terminalmage/py3-salt.utils-w-z 
[PY3] Add unicode_literals to salt.utils modules (W-Z)
 2018-01-14 08:02:22 -05:00
Nicole Thomas
78ce60e4d4
Merge pull request #44977 from terminalmage/remove-more-explicit-unicode-literals 
Remove more unnecessary explicit unicode literals
 2018-01-14 07:55:29 -05:00
Nicole Thomas
b90e7aedde
Merge pull request #45440 from terminalmage/py3-a 
[PY3] Add unicode_literals to states/modules (A)
 2018-01-14 07:52:02 -05:00
Nicole Thomas
4d03162227
Merge pull request #45396 from rallytime/merge-oxygen 
[oxygen] Merge forward from 2017.7 to oxygen
 2018-01-14 07:44:37 -05:00
Erik Johnson
ce6fccde9c
[PY3] Add unicode_literals to states/modules (A) 2018-01-14 01:31:52 -06:00
Erik Johnson
54f9785e6c
[PY3] Add unicode_literals to salt.utils modules (R-S) 2018-01-13 21:14:09 -06:00
Erik Johnson
b89efc16eb
Remove more unnecessary explicit unicode literals 2018-01-13 21:10:04 -06:00
Erik Johnson
42d2b1d719
Python 3 doesn't have 'u' before unicode strings 2018-01-13 21:08:51 -06:00
Erik Johnson
9134f662cc
Update tests to reflect unicode minion IDs in outputters 2018-01-13 21:08:51 -06:00
Erik Johnson
685bfbbd3e
[PY3] Add unicode_literals to cache and cli modules 2018-01-13 21:08:51 -06:00
Erik Johnson
a9c82c47ea
[PY3] Add unicode_literals to salt.utils modules (W-Z) 2018-01-13 20:52:16 -06:00
Nicole Thomas
dcac4d4ce9
Merge pull request #45423 from terminalmage/py3-salt.utils-a-d 
[PY3] Add unicode_literals to salt.utils modules (A-D)
 2018-01-13 20:33:28 -05:00
Erik Johnson
1044b627a1
[PY3] Add unicode_literals to salt.utils modules (A-D) 2018-01-13 16:08:56 -06:00
Erik Johnson
c57b5a5502
Fix breakage in salt.utils.iam 
This fixes breakage introduced in
https://github.com/saltstack/salt/pull/45406 and adds a unit test.
 2018-01-13 15:04:18 -06:00
Daniel Wallace
b9761971c2
fix moto version 
Fixes saltstack/salt-jenkins#692
 2018-01-13 15:01:14 -05:00
Daniel Wallace
0cd95d1cc6
fix test boto imports 
Test boto imports are failing for some reason
 2018-01-13 15:01:14 -05:00
twangboy
e137775c1f
Fix race condition in Windows with the creation time 2018-01-12 16:22:35 -07:00
Nicole Thomas
b7956edb18
Merge pull request #45415 from Ch3LL/change-rackspace 
Change rackspace provider name for >=oxygen cloud tests
 2018-01-12 17:02:18 -05:00
Nicole Thomas
0c58cb77ac
Merge pull request #45406 from garethgreenaway/oxygen_updating_utils_for_unicode_round_two 
[oxygen] Oxygen updating utils and related tests for Unicode round two
 2018-01-12 14:07:47 -05:00
Nicole Thomas
1755af821d
Merge pull request #44866 from DSRCorporation/slots3 
Slots: use execution function return as a state arg value
 2018-01-12 13:58:16 -05:00
rallytime
bbe6f54f84
Update old utils paths to new paths 2018-01-12 12:27:08 -05:00
rallytime
a5719b686b
Lint: Remove unused import 2018-01-12 12:17:31 -05:00
Ch3LL
62035a04ff
update provider rackspace config 2018-01-12 12:02:01 -05:00
Gareth J. Greenaway
0e44911d77
Updating various tests for Unicode goodness 2018-01-12 08:42:39 -08:00
Ch3LL
40677cad21
migrate rackspace to openstack in cloud test 2018-01-12 11:08:28 -05:00
Nicole Thomas
04b8e1cafc
Merge pull request #45401 from gtmanfred/oxygen 
fix boto import failures
 2018-01-12 10:55:48 -05:00
Ch3LL
f7cf8b6e94
Change rackspace provider name for >=oxygen cloud tests 2018-01-12 10:55:31 -05:00
Nicole Thomas
7fa3df48ac
Merge pull request #45404 from twangboy/win_fix_test_vagrant 
Fix `unit.modules.test_vagrant` for Windows
 2018-01-12 09:53:12 -05:00
Nicole Thomas
932ca0b33a
Merge pull request #45403 from terminalmage/windows-encode-decode-fallbacks 
Fall back to utf-8 when to_str/to_unicode/to_bytes fail to encode/decode
 2018-01-12 09:49:35 -05:00
Pablo Suárez Hernández
52f9c06908
Fix integration tests for 'user.present' state. 2018-01-12 12:47:29 +00:00
Daniel Wallace
c378c356eb
fix moto version 
Fixes saltstack/salt-jenkins#692
 2018-01-11 17:42:59 -07:00
twangboy
df64c60530
Remove hard-coded, linux-style paths 2018-01-11 23:24:46 +00:00
Erik Johnson
6fbe368b71
Fall back to utf-8 on windows when to_str/to_unicode/to_bytes fail to encode/decode 2018-01-11 16:49:03 -06:00
Daniel Wallace
fdcf71a10c
fix test boto imports 
Test boto imports are failing for some reason
 2018-01-11 15:14:25 -07:00
Erik Johnson
0cbc6767bf
Fix git.latest failure when rev is not the default branch 2018-01-11 15:26:35 -06:00
rallytime
60370f5fb6
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/config/__init__.py
  - salt/daemons/masterapi.py
  - salt/proxy/dummy.py
  - salt/states/file.py
  - tests/integration/modules/test_state.py
  - tests/integration/runners/test_runner_returns.py
  - tests/integration/ssh/test_state.py
  - tests/support/parser/__init__.py
  - tests/unit/grains/test_core.py
  - tests/unit/states/test_file.py
 2018-01-11 16:00:08 -05:00
twangboy
0356b3d56f
Backport changes from #45308 2018-01-11 15:36:38 -05:00
Nicole Thomas
2340f0b487
Merge pull request #45380 from twangboy/backport_45308 
Backport changes from #45308
 2018-01-11 14:45:20 -05:00
Frode Gundersen
08644e02a0
skip if mac 2018-01-11 19:12:31 +00:00
Nicole Thomas
22c3efda06
Merge pull request #45371 from rallytime/bp-45158 
Back-port #45158 to 2017.7
 2018-01-11 12:51:37 -05:00
Daniel Wallace
065ae4e61f
increase timeout for starting daemons 2018-01-11 10:45:47 -07:00
Daniel Wallace
3cb91b4d63
disable discovery in test suite 2018-01-11 09:58:14 -07:00
Erik Johnson
5473c085d9
Fix loader error in 2017.7 tests 2018-01-11 08:40:27 -06:00
Nicole Thomas
223470519d
Merge pull request #44830 from terminalmage/issue40776 
Implement variable fileserver update intervals
 2018-01-11 09:10:36 -05:00
Dmitry Kuzmenko
f40cb3f2f1
Slots: bugfixes and tests. 2018-01-11 14:05:58 +03:00
Erik Johnson
ff3039db6c
Skip flaky test on 2017.7 branch 
The behavior of the set union used to combine ext_nodes and top file
matches is not consistent on Python 3 (well, 3.5 at least), and this
produces flaky test results.

Since we do not change things like the state compiler in point
releases, the method used to combine the ext_nodes and top file matches
has been changed for Oxygen and is now fully deterministic. This test
will therefore be skipped for the remainder of the 2017.7 release cycle
on Python 3.

Fixes https://github.com/saltstack/salt-jenkins/issues/686.
 2018-01-10 16:02:32 -06:00
Nicole Thomas
a37f7d7cd4
Merge pull request #45377 from terminalmage/py3-log-grains 
[PY3] add unicode_literals to log/grains modules
 2018-01-10 15:14:23 -05:00
twangboy
419be8a9b5
Backport changes from #45308 2018-01-10 11:16:59 -07:00
Erik Johnson
f900715e1c
[PY3] add unicode_literals to log/grains modules 2018-01-10 11:37:59 -06:00
Nicole Thomas
54dc7b76e5
Merge pull request #45340 from twangboy/win_fix_test_beacons 
Fix `unit.modules.test_beacons` for Windows
 2018-01-10 12:10:52 -05:00
Erik Johnson
3565bc2bf2
Don't use include-test SLS in orch tests 
This was the _actual_ cause of the failing test in the state module
integration tests.
 2018-01-10 10:29:15 -05:00
Erik Johnson
8bc17e0d7a
Fix integration.modules.test_state.StateModuleTest.test_exclude 
test_exclude shares file paths with test_include, and while I can't
reproduce the failures, it is likely that improperly cleaned-up files
from test_include are causing the failures in test_exclude. This is
backed up by the fact that the state.sls return data from the
salt-runtests.log shows no trace of the "to-include-test" file
(suggesting it was excluded as expected), yet os.path.isfile() returns
True for this path, causing the test to fail.

This commit uses a distinct base dir for both tests, which should keep
this sort of failure from happening.
 2018-01-10 10:29:15 -05:00
twangboy
e3e0dba15d
Fix failing ubuntu test 2018-01-09 21:30:51 -07:00
Erik Johnson
de7eea42fb
Add test for modified virtualnames in salt.config 2018-01-09 19:11:17 -06:00
Erik Johnson
2d6760ee40
Add update_interval to gitfs, "fs" to several virtual names 
This also adds "fs" to all of the fileserver virtualnames which did not
already have them. This both A) normalizes the usage of the non-roots
backends, and B) makes it easier for the FileserverUpdate process to get
the default update interval for each backend from the opts.
 2018-01-09 19:11:17 -06:00
twangboy
53506a5e86
Fix some additional tests 
- Fix problem with invalid characters in requisites.prereq_simple2
- Fix problem with true/false commands in Windows. Need to use exit
- Fix some issues with hard-coded paths to /tmp
 2018-01-09 16:50:29 -07:00
twangboy
db52f086e3
Fix some tests in integration.modules.test_state 
Fixes the following tests:
- test_get_file_from_env_in_top_match
- test_issue_1896_file_append_source
- test_state_sls_id_test

Fixes in issue in file.managed where a command execution error was being
raised if the target file did not exist.
 2018-01-09 15:21:58 -07:00
twangboy
5d45a4478f
Fix unit.modules.test_file for Windows 
Fixes `_regex_to_static` function for Windows. Regex returns the `\r`
portion of the Windows line ending as part of the regex search. We're
going to trim that off the end.

Skips `test_check_file_meta_no_lsattr` as there is this is Linux
specific

Opens files in binary mode on Windows in the tests

Changes to the appropriate assert calls

Fixes line ending issues in the file_content and file_modified variables
in the test
 2018-01-09 15:17:25 -07:00
Nicole Thomas
12c0f99e8c
Merge pull request #45293 from terminalmage/py3-acl-auth-netapi 
[PY3] Add unicode_literals to acl, auth, and netapi modules
 2018-01-09 16:32:59 -05:00
Nicole Thomas
56de7bcf5d
Merge pull request #45305 from terminalmage/py3-daemons 
[PY3] Add unicode_literals to daemons modules
 2018-01-09 16:30:36 -05:00
Nicole Thomas
4919b9f27d
Merge pull request #45335 from twangboy/win_fix_test_load_beacon 
Skip test_load_match on Windows
 2018-01-09 15:54:11 -05:00
Nicole Thomas
e402807cc0
Merge pull request #45332 from frogunder/fix_mac_archive_tests 
fix test_archive tests for mac
 2018-01-09 15:49:12 -05:00
Nicole Thomas
fb87010461
Merge pull request #45297 from Ch3LL/mac_service_state 
Allow macosx service state tests to check for pid return
 2018-01-09 15:47:23 -05:00
Nicole Thomas
bf38bdca6c
Merge pull request #45280 from rallytime/merge-oxygen 
[oxygen] Merge forward from 2017.7 to oxygen
 2018-01-09 15:37:52 -05:00
Nicole Thomas
227cdbda70
Merge pull request #45337 from twangboy/win_fix_test_core 
Fix `unit.grains.test_core` for Windows
 2018-01-09 10:03:11 -05:00
twangboy
fe2d4ae65b
Fix paths on Windows 2018-01-08 17:20:02 -07:00
twangboy
48f12a3bbc
Skip linux specific tests 2018-01-08 15:38:26 -07:00
twangboy
df0958e699
Fix decorator, fix asserts for Windows 2018-01-08 14:53:18 -07:00
Nicole Thomas
8d04c2b3d4
Merge pull request #44856 from Ch3LL/running_test 
Add state.running ssh integration test
 2018-01-08 16:40:49 -05:00
twangboy
b49b52e113
Skip test_load_match on Windows 2018-01-08 14:31:46 -07:00
Nicole Thomas
981776b9ac
Merge pull request #45322 from Ch3LL/isci_test_mac 
Skip iscsi grains test if MacOSX
 2018-01-08 16:28:13 -05:00
Nicole Thomas
d0e5e70277
Merge pull request #45295 from gtmanfred/test_directory 
test directory that doesn't exist
 2018-01-08 15:59:52 -05:00