7191 Commits

Author	SHA1	Message	Date
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
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	154c9255f5	Merge pull request #45316 from terminalmage/py3-engines ... [PY3] Add unicode_literals to engines	2018-01-08 12:08:57 -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
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
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
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
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
Nicole Thomas	4f514a29a7	Merge branch '2017.7' into pkg-uptodate	2018-01-02 09:56:28 -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
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	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
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
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
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	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
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
Gareth J. Greenaway	0ff811de70	Swapping import to be the old path for 2016.11	2017-12-21 08:17:53 -08:00
Gareth J. Greenaway	b3e2f388f5	Fix to allow nodegroups to include sequences	2017-12-20 16:56:16 -08:00
rallytime	ec2a32a106	Update old utils paths to new paths	2017-12-20 08:03:14 -05: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
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	387378c4b6	Properly support pillarenv in docker.sls_build	2017-12-19 12:09:35 -06:00
Nicole Thomas	aea1a584a5	Merge pull request #45054 from AAbouZaid/toml_serializer ... Add TOML serializer.	2017-12-19 10:23:22 -05: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
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