6211 Commits

Author	SHA1	Message	Date
rallytime	e0ffa32b49	Merge branch '2016.11' into '2017.7' ... Conflicts: - tests/integration/modules/test_pkg.py	2018-01-19 10:09:36 -05: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
Frode Gundersen	ccf062d62e	fix test_archive test for mac on 2017.7 branch	2018-01-17 18:54:35 +00: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
Erik Johnson	5473c085d9	Fix loader error in 2017.7 tests	2018-01-11 08:40:27 -06: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
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	e6178fe6d4	Merge branch '2017.7' into test_directory	2018-01-05 17:08:58 -05:00
Daniel Wallace	24114e91c1	test was different slightly on 2017.7	2018-01-05 12:25:09 -07: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
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
rallytime	68f971b38f	Apply test fixes from #45034 to parsers_test.py	2018-01-03 15:10:04 -05:00
Nicole Thomas	4f514a29a7	Merge branch '2017.7' into pkg-uptodate	2018-01-02 09:56:28 -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
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
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
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
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
twangboy	40665d7b08	Skip test_log_created on Windows	2017-12-13 14:12:07 -07:00
rallytime	a0d2dd2069	Lint fix	2017-12-13 14:06:11 -05:00
rallytime	9db4179462	Merge branch '2016.11' into '2017.7' ... Conflicts: - tests/unit/grains/test_core.py	2017-12-12 15:24:30 -05:00
Daniel Wallace	66bb755751	add test for effective acls	2017-12-12 09:58:08 -07:00
Nicole Thomas	85160fd297	Merge pull request #44921 from Ch3LL/log_test ... Add test to ensure log files are created	2017-12-11 13:24:15 -05:00
Ch3LL	3bb58fb577	skip salt-key log creation test	2017-12-11 10:59:10 -05:00
Nicole Thomas	df28f312ac	Merge pull request #44879 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2016.11 to 2017.7	2017-12-10 11:53:43 -05:00
Nicole Thomas	f5a143f8c5	Merge pull request #44621 from isbm/isbm-bsc1068446-2017.7 ... Bugfix: errors in external pillar causes crash, instead of report of them	2017-12-08 13:46:55 -05:00
rallytime	23c5a4ca3e	Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/modules/win_pkg.py - salt/states/file.py - tests/integration/states/test_file.py - tests/unit/states/test_file.py	2017-12-07 17:33:03 -05:00
Ch3LL	6a379195bc	Add test to ensure log files are created	2017-12-07 17:31:26 -05:00
Nicole Thomas	abe089ad54	Merge pull request #43379 from twangboy/win_fix_file.managed ... Fix file.managed on Windows with test=True	2017-12-07 16:10:42 -05:00
Gareth J. Greenaway	edcd581ca5	Merge branch '2017.7' into win_fix_file.managed	2017-12-07 10:00:55 -08:00
Daniel Wallace	3f1268d67f	fix patching for python 2.6	2017-12-07 08:25:26 -07:00
Nicole Thomas	7adcfbf8ec	Merge branch '2017.7' into develop2	2017-12-07 10:14:52 -05:00
Nicole Thomas	23d151b40a	Merge pull request #44784 from rallytime/merge-2017.7-1 ... [2017.7] Merge forward from 2016.11 to 2017.7	2017-12-05 12:13:48 -05:00
twangboy	0ff9fa498a	Fix test_directory	2017-12-04 14:05:54 -07:00
twangboy	d5dd42aebe	Fix integration tests for Windows	2017-12-04 14:05:53 -07:00
twangboy	a24b964ea5	Fix unit test to handle new Exception	2017-12-04 14:05:52 -07:00
twangboy	4602f499a2	Remove loader module mixin, add linux paths	2017-12-04 14:05:52 -07:00
twangboy	99b27c037f	Add tests to avoid future regression	2017-12-04 14:05:51 -07:00
Daniel Wallace	1d0bd5bb32	Merge branch '2016.11' into 2016.11	2017-12-04 10:13:15 -07:00
Bo Maryniuk	0d2675c4fe	Use variable, instead of direct value	2017-12-04 15:51:56 +01:00
Bo Maryniuk	1ddc47da0a	Add unit test for _get_pillar_errors when external pillar is clean and internal contains errors	2017-12-04 15:51:56 +01:00
Bo Maryniuk	68480d5dc9	Add unit test for _get_pillar_errors when both external and internal pillars contains errors	2017-12-04 15:51:56 +01:00
Bo Maryniuk	218a59e93b	Add unit test for _get_pillar_errors when external pillar has errors and internal is clean	2017-12-04 15:51:56 +01:00
Bo Maryniuk	3ce19356c2	Add unit test for _get_pillar_errors when external and internal pillars are clean	2017-12-04 15:51:56 +01:00