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
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
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
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
Frode Gundersen
9edca8a6cf
fix test_archive tests for mac
2018-01-08 20:18:52 +00: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
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
Daniel Wallace
64d7cf165e
if check should be not
2018-01-05 14:43:13 -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
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
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
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
