valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
89,980 Commits 24 Branches 182 Tags 341 MiB
a7460cebc6
Commit Graph

12063 Commits

Author SHA1 Message Date
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
Frode Gundersen
9edca8a6cf
fix test_archive tests for mac 2018-01-08 20:18:52 +00:00
Nicole Thomas
f49b204b75
Merge pull request #45302 from gtmanfred/proxyp3 
fix proxy tests for py3 on 2017.7
 2018-01-08 12:41:57 -05:00
Nicole Thomas
29788617f1
Merge pull request #45306 from gtmanfred/rackspace 
Fix rackspace cloud test
 2018-01-08 12:32:46 -05:00
Nicole Thomas
eea7158e82
Merge pull request #45279 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2018-01-08 12:26:48 -05:00
Nicole Thomas
154c9255f5
Merge pull request #45316 from terminalmage/py3-engines 
[PY3] Add unicode_literals to engines
 2018-01-08 12:08:57 -05:00
Nicole Thomas
438a16626a
Merge pull request #45317 from terminalmage/py3-config-executors 
[PY3] Add unicode_literals to config, executors
 2018-01-08 12:07:08 -05:00
Ch3LL
0919d8787b
Skip iscsi grains test if MacOSX 2018-01-08 10:54:45 -05:00
Erik Johnson
7c9d95a725
[PY3] Add unicode_literals to config, executors 2018-01-07 14:48:45 -06:00
Erik Johnson
0d975c335d
Add unicode_literals to engines 2018-01-07 14:01:48 -06:00
Daniel Wallace
a8341fea01
clean up for windows tests for kitchen-salt 2018-01-06 17:14:46 -07:00
Nicole Thomas
e6178fe6d4
Merge branch '2017.7' into test_directory 2018-01-05 17:08:58 -05:00
Daniel Wallace
64d7cf165e
if check should be not 2018-01-05 14:43:13 -07:00
Erik Johnson
5b91c78cb6
[PY3] Add unicode_literals to daemons modules 2018-01-05 15:34:48 -06:00
Ch3LL
9a35a73711
add time limit to while loop 2018-01-05 16:18:31 -05:00
Daniel Wallace
e2824a7253
fix py3 tests 2018-01-05 13:36:08 -07:00
Daniel Wallace
24114e91c1
test was different slightly on 2017.7 2018-01-05 12:25:09 -07:00
Nicole Thomas
239ab765d9
Merge pull request #45271 from terminalmage/py3-cloud 
[PY3] Add unicode_literals to salt-cloud modules
 2018-01-05 12:38:01 -05:00
Ch3LL
4e569b5802
Allow macosx service state tests to check for pid return 2018-01-05 12:25:44 -05:00
Daniel Wallace
d20fc93625
test directory that doesn't exist 
sometimes /etc/grub.conf exists and is a symlink to /boot/grub/grub.conf, and
this won't do the right thing.
 2018-01-05 09:51:58 -07:00
Erik Johnson
49dd5b32e9
[PY3] Add unicode_literals to acl, auth, and netapi modules 2018-01-05 10:31:11 -06:00
Nicole Thomas
f09d0e5fdb
Merge pull request #45277 from rallytime/bp-45025 
Back-port #45025 to 2017.7
 2018-01-05 10:35:52 -05:00
rallytime
59076f5ee8
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/client/ssh/wrapper/state.py
  - salt/modules/yumpkg.py
 2018-01-04 17:45:29 -05:00
rallytime
8025b14584
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - tests/unit/utils/test_parsers.py
 2018-01-04 17:37:48 -05:00
Steve Weber
942c14bb29
pillar body overrides includes 
vars in pillar body override pillar includes
 2018-01-04 17:33:39 -05:00
Daniel Wallace
cf98ed472e
fix up symlinks 2018-01-04 17:29:45 -05:00
Nicole Thomas
2934b60d53
Merge pull request #45254 from Ch3LL/fix_mac_grain_ssh 
Add darwin value for ssh grain items tests on MacOSX
 2018-01-04 16:31:34 -05:00
Nicole Thomas
d0a3770035
Merge pull request #44930 from frogunder/man_spm 
man_spm_test
 2018-01-04 15:58:01 -05:00
Ch3LL
b4b59b89cd
remove platform from salt.utils call for 2017.7 2018-01-04 14:42:30 -05:00
Erik Johnson
d3f8c13414
[PY3] Add unicode_literals to salt-cloud modules 2018-01-04 13:39:59 -06:00
Erik Johnson
1dc6e79638
[PY3] Add unicode_literals to ext_pillar modules 2018-01-04 08:46:40 -06:00
Nicole Thomas
0658e0f664
Merge pull request #45190 from terminalmage/yaml 
Replace yaml usage with a helper to ensure unicode is handled properly
 2018-01-04 09:04:02 -05:00
Ch3LL
74e6ed60ea
Fix MacOSX Service Status Check and integration test 2018-01-03 17:19:51 -05:00
Daniel Wallace
19198fd866
fix up symlinks 2018-01-03 15:08:42 -07:00
Erik Johnson
002aa88a97
Replace yaml usage with a helper to ensure unicode is handled properly 
Without allow_unicode=True, unicode characters are processed through the
str representer and on Python 2 are dumped as a Unicode code point (i.e.
a literal \u0414). This commit makes allow_unicode=True the default in
our salt.utils.yamlloader.safe_dump() helper. It also adds a new
salt.utils.yamlloader.dump() helper which wraps yaml.dump() and also
makes allow_unicode=True the default.

To make importing and using our custom yaml loader/dumper easier, a
convenience module called salt.utils.yaml has been added, which does a
wildcard import from both salt.utils.yamldumper and
salt.utils.yamlloader.

Refs to yaml.load/dump and yaml.safe_load/safe_dump have been updated to
salt.utils.yaml, to ensure that unicode is handled properly.
 2018-01-03 14:14:21 -06:00
rallytime
68f971b38f
Apply test fixes from #45034 to parsers_test.py 2018-01-03 15:10:04 -05:00
Ch3LL
85e853a63d
Add darwin value for ssh grain items tests on MacOSX 2018-01-03 13:58:28 -05:00
Nicole Thomas
eba360870a
Merge pull request #45233 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2018-01-03 10:33:59 -05:00
rallytime
a3d251b2cd
Merge branch '2016.11' into '2017.7' 2018-01-02 15:21:58 -05:00
Nicole Thomas
4ae309af6a
Merge pull request #45222 from rallytime/merge-oxygen 
[oxygen] Merge forward from 2017.7 to oxygen
 2018-01-02 14:33:07 -05:00
Daniel Wallace
2d0a9bbf7e
enable UsePAM for ssh tests 2018-01-02 12:29:43 -05:00
Nicole Thomas
70ccdef729
Merge pull request #45218 from gtmanfred/oxygen 
fix up rackspace/openstack cloud test
 2018-01-02 11:35:04 -05:00
Nicole Thomas
4f514a29a7
Merge branch '2017.7' into pkg-uptodate 2018-01-02 09:56:28 -05:00
Gareth J. Greenaway
ba7ff8b2e0
Merge branch 'oxygen' into scheduler_cron_tests 2018-01-01 16:46:02 -08:00
Nicole Thomas
b3e0146ca1
Lint: 2 spaces before comment 2017-12-30 16:10:37 -05:00
Nicole Thomas
cc13a54e21
Merge pull request #45219 from gtmanfred/test_directory 
test directory that doesn't exist
 2017-12-30 13:11:33 -05:00
Daniel Wallace
1182f250ca
fix up rackspace/openstack cloud test 2017-12-30 11:09:45 -07:00
rallytime
da1e33abea
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - pkg/windows/req_base.txt
  - salt/engines/slack.py
  - salt/modules/cmdmod.py
  - salt/modules/osquery.py
  - salt/modules/pip.py
  - salt/modules/win_pkg.py
  - salt/states/pip_state.py
  - tests/integration/modules/test_cmdmod.py
 2017-12-30 08:44:11 -05:00
Nicole Thomas
abed378981
Merge pull request #45204 from garethgreenaway/45176_fixes_to_osquery_module 
[2017.7] Fixes to osquery module & addition of unit tests
 2017-12-30 08:25:37 -05:00
Nicole Thomas
296cda8e80
Merge pull request #45207 from terminalmage/py3-spm-queues-rosters 
[PY3] Add unicode_literals to spm, queues, and rosters
 2017-12-30 08:24:30 -05:00
Nicole Thomas
4637a3b43c
Merge pull request #45211 from terminalmage/py3-transport 
[PY3] Add unicode_literals to transports
 2017-12-30 07:40:51 -05:00
Daniel Wallace
fd6597a2b4
test directory that doesn't exist 
sometimes /etc/grub.conf exists and is a symlink to /boot/grub/grub.conf, and
this won't do the right thing.
 2017-12-29 10:19:24 -07:00
Adam Mendlik
29ef67bac2
Test pkg.uptodate with failed upgrades 2017-12-29 07:18:50 -07:00
Adam Mendlik
7c67ec39d9
Add tests for pkg.uptodate state 2017-12-29 07:18:49 -07:00
Nicole Thomas
d595c7af36
Merge pull request #45205 from terminalmage/py3-serializers 
[PY3] Add unicode_literals to sdb and serializers
 2017-12-28 20:12:31 -05:00
Nicole Thomas
5991d8ca15
Merge pull request #45203 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-12-28 20:11:02 -05:00
Gareth J. Greenaway
d834bd1b6f
Fixing some minor lint issues. 2017-12-28 17:07:38 -08:00
Gareth J. Greenaway
4738205154
Fixing a bug when attributes are passed to various osquery module functions. 2017-12-28 17:07:38 -08:00
Erik Johnson
3f85b60077
[PY3] Add unicode_literals to transports 2017-12-28 17:10:42 -06:00
Daniel Wallace
0495c0de7f
enable UsePAM for ssh tests 2017-12-28 15:41:25 -07:00
Erik Johnson
f78c71bd6b
[PY3] Add unicode_literals to spm, queues, and rosters 2017-12-28 15:30:27 -06:00
Gareth J. Greenaway
a9c36b08ff
Gating the cron tests for the scheduler to ensure that the croniter module is installed before we attempt to run these tests 2017-12-28 11:21:18 -08:00
Gareth J. Greenaway
2f4653e271
Adding tests for cron functionality. 2017-12-28 11:21:18 -08:00
Erik Johnson
6f979773b8
[PY3] Add unicode_literals to sdb and serializers 
NOTE: the other serializers were done in a previous commit.
 2017-12-28 13:18:00 -06:00
rallytime
430c913c8c
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/auth/pam.py
  - salt/master.py
  - tests/unit/test_target.py
 2017-12-28 12:15:54 -05:00
rallytime
a26d4795bd
[2017.7] Fix docstring integration test failure 2017-12-28 10:59:16 -05:00
Nicole Thomas
f093fe1af0
Merge pull request #45095 from terminalmage/py3-loader 
PY3: Make loader ignore .pyc files not in __pycache__
 2017-12-27 18:23:35 -05:00
Nicole Thomas
42185b79b8
Merge branch 'oxygen' into py3-loader 2017-12-27 13:42:44 -05:00
Erik Johnson
7b13a7df8b
Replace json module usage with a helper to ensure unicode content is handled properly 
This adds wrappers for json.dump{,s} which disable `ensure_ascii` by
default.
 2017-12-27 09:30:58 -06:00
Erik Johnson
a73c380341
Don't use include-test SLS in orch tests 
This was the _actual_ cause of the failing test in the state module
integration tests.
 2017-12-24 12:49:45 -06:00
Erik Johnson
4bf072435d
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.
 2017-12-24 12:08:57 -06:00
Erik Johnson
d9a915fdc9
Update mocking in unit.grains.test_core.CoreGrainsTestCase.test_docker_virtual 
This fixes this test in Oxygen, where the function name has changed.
 2017-12-23 19:47:37 -06:00
Gareth J. Greenaway
48eafe3206
Adding some tests to tests cmd.script with cwd 2017-12-21 15:53:38 -08:00
rallytime
9ded5e1cbb
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/config/__init__.py
  - salt/grains/core.py
  - salt/modules/win_lgpo.py
  - salt/returners/mysql.py
  - salt/states/libcloud_dns.py
  - tests/integration/runners/test_runner_returns.py
  - tests/unit/grains/test_core.py
 2017-12-21 15:58:08 -05:00
Nicole Thomas
b49ee97938
Merge pull request #45124 from gtmanfred/2017.7 
enable using kitchen-salt with ec2 on 2017.7
 2017-12-21 14:11:27 -05:00
Daniel Wallace
d0586013eb
fix pylint 2017-12-21 10:40:54 -07:00
Gareth J. Greenaway
98a9ddf10c
Merge branch 'oxygen' into scheduler_fixes_loop_interval 2017-12-21 08:36:09 -08:00
Gareth J. Greenaway
0ff811de70
Swapping import to be the old path for 2016.11 2017-12-21 08:17:53 -08:00
Daniel Wallace
59e2e56d13
chmod the xml files before trying to copy 2017-12-21 08:17:10 -07:00
Daniel Wallace
a5c1410e23
catch IOError when copying xml files back 2017-12-20 18:26:18 -07:00
Gareth J. Greenaway
b3e2f388f5
Fix to allow nodegroups to include sequences 2017-12-20 16:56:16 -08:00
Daniel Wallace
23bd38ad66
enable using kitchen-salt on ec2 
These changes are needed to run the test suite on ec2 using sudo.
 2017-12-20 17:18:39 -07:00
Nicole Thomas
42e894570d
Merge pull request #45087 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-12-20 17:24:50 -05:00
Nicole Thomas
21de54de44
Merge pull request #45105 from rallytime/utils-path-update 
Update old utils paths to new paths
 2017-12-20 17:22:29 -05:00
Ch3LL
1bd7110a14
Fix spm big file build test to check /tmp 2017-12-20 14:40:10 -05:00
rallytime
fe81e2d39a
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-12-20 10:26:10 -05:00
Erik Johnson
8c360dd3fb
Revert "Clear Python 2 .pyc files when Python 3 suite runs" 
This reverts commit 7a60cfd171.
 2017-12-20 08:39:41 -06:00
rallytime
ec2a32a106
Update old utils paths to new paths 2017-12-20 08:03:14 -05:00
Michael Calmer
744e698689
adapt tests to reflect reality 
When CherryPy run with python3 it reads "bytes" from the wire.
In case of python2 BytesIO == StringIO, so nothing should change.

This change will do the same to make unit tests reflect reality.
 2017-12-20 06:59:56 -05:00
Erik Johnson
80b6bd6813
Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install 
Carbon 1.1.1 for some reason added six to their setup.py, which breaks
this test since it's not installed into the virtualenv. This PR forces
this test to use a version of carbon which does not dep on six in its
setup.py.
 2017-12-20 06:54:30 -05:00
Nicole Thomas
dafd2fc61f
Merge pull request #45083 from Ch3LL/gce_test_fix 
Force gce cloud test name to be lowercase
 2017-12-20 06:46:23 -05:00
Nicole Thomas
19997e4d81
Merge pull request #45092 from terminalmage/fix-pip-test 
Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install
 2017-12-20 05:52:08 -05:00
Erik Johnson
109c9936d3
Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install 
Carbon 1.1.1 for some reason added six to their setup.py, which breaks
this test since it's not installed into the virtualenv. This PR forces
this test to use a version of carbon which does not dep on six in its
setup.py.
 2017-12-19 18:37:59 -06:00
Erik Johnson
7a60cfd171
Clear Python 2 .pyc files when Python 3 suite runs 
This prevents import errors when Python 2 .pyc files exist and the test
suite is run under Python 3.
 2017-12-19 15:35:10 -06:00
Erik Johnson
e65237c390
Update test to match how file.append works 2017-12-19 15:34:31 -06:00
Erik Johnson
4501d0d6f9
Fix nested structure test for py2 and py3 2017-12-19 15:34:11 -06:00
Frode Gundersen
dfb68f32d2
fix if statements and string 2017-12-19 19:45:19 +00:00
Erik Johnson
7d6b679ac4
Fix fake importer for Python 3 
Python 3 does not appear to pass all values to the `__import__` builtin
when they do not differ from the defaults. Therefore, the fake import
fails because of missing positional args.

This fix simply uses the defaults from Python 2 and 3's `__import__`
builtin.
 2017-12-19 12:09:36 -06:00
Erik Johnson
016ffbe7f8
Fix incorrectly-written VMware tests 2017-12-19 12:09:36 -06:00
Erik Johnson
c6f54ecff4
Make lazydict workaround PY3-compatible 2017-12-19 12:09:36 -06:00
Erik Johnson
2d0e96385f
Fix import of ipaddress on PY3 
This should only be imported on PY2
 2017-12-19 12:09:36 -06:00
Erik Johnson
15296e59a5
Add debug logging to SSHCase 2017-12-19 12:09:35 -06:00
Erik Johnson
387378c4b6
Properly support pillarenv in docker.sls_build 2017-12-19 12:09:35 -06:00
Nicole Thomas
e0d7b330fa
Merge pull request #44650 from frogunder/status 
add status.pid test
 2017-12-19 11:21:08 -05:00
Nicole Thomas
aea1a584a5
Merge pull request #45054 from AAbouZaid/toml_serializer 
Add TOML serializer.
 2017-12-19 10:23:22 -05:00
Ch3LL
5336dac2e1
Force gce cloud test name to be lowercase 2017-12-19 10:07:06 -05:00
Gareth J. Greenaway
8c5d515ccd
Merge branch 'oxygen' into scheduler_fixes_loop_interval 2017-12-18 15:24:16 -08:00
Nicole Thomas
8331d51628
Merge pull request #45041 from terminalmage/add-print_function 
[PY3] Add print_function import to files with unicode_literals already added
 2017-12-18 11:45:26 -05:00
Gareth J. Greenaway
047e76cb31
Merge branch 'oxygen' into scheduler_fixes_loop_interval 2017-12-18 08:10:39 -08:00
Nicole Thomas
5bd7854d27
Merge pull request #45042 from rallytime/py3-rsync-tests 
Fix a couple of PY3 test failures in the rsync module
 2017-12-16 08:18:24 -05:00
Nicole Thomas
04a2ea8cd1
Merge pull request #45019 from rallytime/merge-oxygen 
[oxygen] Merge forward from 2017.7 to oxygen
 2017-12-16 08:16:57 -05:00
Nicole Thomas
5137be01ec
Merge pull request #44951 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-12-16 08:16:23 -05:00
rallytime
ecb1e3cf82
Fix a couple of PY3 test failures in the rsync module 
Fixes:
  - unit.modules.test_rsync.RsyncTestCase.test_rsync
  - unit.modules.test_rsync.RsyncTestCase.test_version
 2017-12-15 14:32:32 -05:00
Erik Johnson
8cdb9ea54f
[PY3] Add print_function import to files with unicode_literals already added 
This makes the 2.x usage invalid syntax and forces the use of print as a
function. This adds the import to the files which I've updated in the
last couple of days but forgot to add it.
 2017-12-15 12:14:18 -06:00
Nicole Thomas
81ded2aaba
Merge pull request #44533 from cloudflare/nested-colors 
Nested outputter colors depending on the function retcode
 2017-12-15 12:28:02 -05:00
Nicole Thomas
abf34064a1
Merge pull request #44916 from jasperla/status/openbsd/meminfo 
status.meminfo: add OpenBSD support
 2017-12-15 12:25:56 -05:00
Nicole Thomas
4e56835221
Merge pull request #45032 from terminalmage/renderers-returners-unicode 
[PY3] Add unicode_literals to renderers and returners
 2017-12-15 12:04:46 -05:00
Nicole Thomas
129115ee35
Merge pull request #45028 from terminalmage/runners-unicode 
[PY3] Add unicode_literals to runner modules
 2017-12-15 12:04:22 -05:00
Nicole Thomas
e631ce1276
Merge pull request #45030 from terminalmage/moar-unicode 
[PY3] Add unicode_literals to tops, thorium, proxy, tokens
 2017-12-15 12:04:05 -05:00
Gareth J. Greenaway
63a22349d5
Random LOOP_INTERVALS should end at 59 seconds. 2017-12-15 08:53:17 -08:00
Gareth J. Greenaway
e55bc75cbe
Ensure the default loop_interval of 1 second is used until we override it in the individual tests. 2017-12-15 08:53:17 -08:00
Gareth J. Greenaway
da91283886
Updates to the schedule to handle cases where the loop_interval is not 1 second 2017-12-15 08:53:17 -08:00
Erik Johnson
239fc8d774
[PY3] Add unicode literals to the clients and associated files/tests 2017-12-15 00:19:55 -06:00
Erik Johnson
c65d4714e5
[PY3] Add unicode_literals to renderers and returners 2017-12-15 00:17:26 -06:00
Erik Johnson
7147ac69ac
Add unicode_literals to tops, thorium, proxy, tokens 2017-12-14 21:56:49 -06:00
Erik Johnson
5adf852615
Add unicode_literals to runner modules 2017-12-14 19:30:14 -06:00
Frode Gundersen
48e6953e1f
fix_string_error 2017-12-14 22:40:59 +00:00
Nicole Thomas
653ad2a224
Merge pull request #44946 from terminalmage/unicode-file 
[PY3] Update file state/execution modules and associated files with unicode_literals
 2017-12-14 16:26:50 -05:00
rallytime
3e319d50b3
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - README.rst
  - salt/modules/win_pkg.py
  - salt/utils/process.py
 2017-12-14 13:01:29 -05:00
Jasper Lievisse Adriaanse
5d4d1e29ff
status.meminfo: add OpenBSD support 2017-12-14 18:00:27 +01:00
Nicole Thomas
ae8dd2e202
Merge pull request #44982 from terminalmage/docker-unicode 
[PY3] Add unicode_literals to docker state/execution modules
 2017-12-14 11:03:15 -05:00
Nicole Thomas
4dda5f9977
Merge pull request #44985 from terminalmage/salt-ext-unicode 
[PY3] Add unicode_literals to files in root salt/ dir (and associated tests)
 2017-12-14 10:48:52 -05:00
Nicole Thomas
aef2521853
Merge pull request #44986 from terminalmage/salt.output-unicode 
[PY3] Add unicode_literals to outputters
 2017-12-14 10:47:04 -05:00
Erik Johnson
f73110ff83
Unskip this test 
It has been edited to work properly and should be fine in PY3 now.
 2017-12-14 08:40:58 -06:00
Nicole Thomas
1bd260a663
Merge pull request #44821 from jasperla/status/openbsd/cpuinfo 
make status.cpuinfo work on non-FreeBSD
 2017-12-14 09:29:27 -05:00
Nicole Thomas
d9a0c02cea
Merge pull request #44877 from terminalmage/os.walk 
Replace os.walk with a helper function
 2017-12-14 09:09:56 -05:00
Nicole Thomas
95f0be2116
Merge pull request #44950 from gtmanfred/route53 
Add Healthcheck for route53 module
 2017-12-14 09:02:54 -05:00