94006 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	79994ecab4	Merge pull request #48962 from garethgreenaway/1022_test_service_disable_debian_part_deux ... [2017.7] Fixing tests/integration/modules/test_service.py	2018-08-07 07:52:51 -04:00
twangboy	6532706d2f	Make the tests run on Linux	2018-08-06 17:55:46 -06:00
twangboy	cfe55a391a	Add tests for pkg.install output	2018-08-06 17:53:37 -06:00
Daniel Wozniak	1a1bda00cb	Merge pull request #48960 from dwoz/block_replace_tests ... Multiple block replace test fixes	2018-08-06 16:01:25 -07:00
Gareth J. Greenaway	9e71551b36	Update the elif block to only be true for versions below Debian 9.	2018-08-06 15:11:55 -07:00
Nicole Thomas	93b862f350	Merge pull request #48957 from whytewolf/beacons_log_doc_change ... Update salt.beacons.log to reflect that re module is used for matching.	2018-08-06 16:52:26 -04:00
Daniel A Wozniak	94ac2b4fc7	Multiple block replace test fixes	2018-08-06 13:35:21 -07:00
Erik Johnson	e2d19f40b6	Only try latin-1 from get_diff instead of by default	2018-08-06 15:31:21 -05:00
Erik Johnson	d39fa889f3	Add stringutils.get_diff to mocks	2018-08-06 15:27:13 -05:00
rallytime	aaf986d728	Mark one grains test as flaky & convert to pytest notation	2018-08-06 15:03:27 -04:00
Nicole Thomas	0245cffb07	Merge pull request #48955 from terminalmage/service-systemd ... Don't load service.py if minion is running a non-sysvinit init system	2018-08-06 15:01:08 -04:00
rallytime	e7e5abcf48	Mark 2 matcher tests as flaky	2018-08-06 14:47:44 -04:00
Thomas Phipps	a77fd16869	Update salt.beacons.log to reflect that re module is used for matching. ... As more non-python users are starting to use Salt, it would be useful to point out which regular expression engines are in use so that users can adapt accordingly.	2018-08-06 11:31:44 -07:00
Daniel Wallace	4cb1636c4b	if booted from volume, use string from image ... If cloud servers in openstack are booted with a volume as their root partition, they do not have an image assigned to them, so they won't have an image id. In these cases just pass the string from node.image to the image information about that machine. Fixes #47766	2018-08-06 12:06:10 -05:00
twangboy	8ec058f498	Clarify code comment	2018-08-06 10:36:44 -06:00
Erik Johnson	23f87bd536	Don't load service.py if minion is running a non-sysvinit init system ... This keeps service.py from overriding systemd.py, among others.	2018-08-06 10:10:32 -05:00
Nicole Thomas	848d583438	Merge pull request #48950 from KaiSforza/kitchenfix-2017.7 ... Added a quote to kitchen Jenkinsfiles	2018-08-06 10:29:07 -04:00
William Giokas	5242cb143a	Added a quote to kitchen Jenkinsfiles ... Kitchen wasn't running correctly	2018-08-06 08:25:25 -06:00
Nicole Thomas	71f587edd7	Merge pull request #48319 from gtmanfred/jid ... don't break older returners right now	2018-08-06 09:19:42 -04:00
Nicole Thomas	1623e53ef4	Merge pull request #48941 from rallytime/bp-48912 ... Back-port #48912 to 2018.3	2018-08-06 09:09:37 -04:00
Nicole Thomas	928d688d65	Merge pull request #48943 from rallytime/flaky-tests ... Mark some shell and runner integration tests as flaky	2018-08-06 09:08:13 -04:00
Erik Johnson	5b191c9120	Fix incorrect use of __salt__ when __utils__ is needed	2018-08-06 06:26:57 -05:00
Erik Johnson	53ba10ad5f	Skip pylint false-positives	2018-08-06 06:26:37 -05:00
Daniel Wallace	cd42510d3a	Merge pull request #48940 from rallytime/bp-48852 ... Back-port #48852 to 2017.7	2018-08-05 16:32:26 -05:00
rallytime	668da57ab9	Mark some shell and runner integration tests as flaky ... In addition to marking these tests as flaky, the commit also updates the affected tests to use pytest notation instead of unittest notation.	2018-08-05 16:19:29 -04:00
msermin	3f55b2f89e	make jboss7.py compatible with 2018.3.0 and later	2018-08-05 15:55:01 -04:00
William Giokas	fa4ef92e79	Record all the artifacts from the build	2018-08-05 15:53:18 -04:00
Nicole Thomas	43649a68be	Merge pull request #48935 from garethgreenaway/1045_test_pkg_015_installed_held_centos ... [2017.7] Fix to test_pkg.test_pkg_015_installed_held	2018-08-05 15:47:38 -04:00
Nicole Thomas	084e7f0ef4	Merge branch '2018.3' into jid	2018-08-05 15:16:41 -04:00
Nicole Thomas	070af9d925	Merge pull request #48897 from rallytime/bp-48863 ... Back-port #48863 to 2018.3	2018-08-05 15:15:50 -04:00
Nicole Thomas	2421e2a570	Merge pull request #47100 from gtmanfred/ssh ... Allow for not being prompted to supply a password to deploy keys to a…	2018-08-05 15:12:57 -04:00
Nicole Thomas	d541bd6446	Merge pull request #48891 from damon-atkins/2017.7_win_pkg.list_pkgs_not_found ... win_pkg: Fix issue introduced in Jan 2018 DisplayVersion missing should result…	2018-08-05 14:53:46 -04:00
Nicole Thomas	5f6a56f5dc	Merge pull request #48896 from rallytime/bp-48730 ... Back-port #48730 to 2017.7	2018-08-05 14:20:39 -04:00
Nicole Thomas	0bb10107b6	Merge branch '2017.7' into 1045_test_pkg_015_installed_held_centos	2018-08-05 14:12:26 -04:00
Nicole Thomas	0c64bba865	Merge pull request #48933 from garethgreenaway/1022_debian_8_failing_service-test ... [2017.7] Fix to test_service_disable_doesnot_exist	2018-08-05 10:29:42 -04:00
Nicole Thomas	abd7f1312d	Merge pull request #48928 from Ch3LL/mac_runas ... fix test_runas integration test for macosx	2018-08-05 10:24:12 -04:00
Nicole Thomas	dbd300ff70	Merge pull request #48899 from Ch3LL/unit_state ... remove base_top_file file in teardown and add sleep	2018-08-05 10:23:41 -04:00
Nicole Thomas	ffa1fcc682	Merge pull request #48898 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-08-05 10:23:18 -04:00
Gareth J. Greenaway	24d5e6a22f	Fixing the test_pkg_015_installed_held test to be able to successfully run on CentOS	2018-08-03 21:36:59 -07:00
Gareth J. Greenaway	280d1d2ad2	Fixing failing test, integration.modules.test_service.ServiceModuleTest.test_service_disable_doesnot_exist, on Debian 8 and higher.	2018-08-03 16:39:48 -07:00
Erik Johnson	f14f4dae22	Add unit test for latin-1 fallback, multi-encoding	2018-08-03 18:38:08 -05:00
Erik Johnson	906644a80f	PY3 scoping fix ... In PY3 the caught exceptions now drop out of scope when leaving the for loop.	2018-08-03 18:36:01 -05:00
Erik Johnson	726dd4331f	Add integration test for latin-1 file diffs	2018-08-03 17:30:17 -05:00
Erik Johnson	2dd1f31d23	Use BASE_FILES instead of redundant STATE_DIR	2018-08-03 16:46:01 -05:00
Erik Johnson	612ffb5fe8	Use new get_diff helper in file module	2018-08-03 16:39:53 -05:00
Erik Johnson	c632265802	Make to_unicode/to_str/to_bytes helpers attempt latin-1 ... Also allow for multiple encodings to be passed	2018-08-03 16:34:54 -05:00
Nicole Thomas	57aa204c9d	Merge branch '2017.7' into bp-48730	2018-08-03 17:08:07 -04:00
Nicole Thomas	0ee1940232	Merge branch '2018.3' into bp-48863	2018-08-03 17:07:42 -04:00
Nicole Thomas	0c3d2c6a09	Merge pull request #48922 from rallytime/cache-doc-error ... Update backticks on job_cache docs	2018-08-03 17:05:45 -04:00
Nicole Thomas	8d1fc4f8e5	Merge pull request #48866 from Ch3LL/cmd_win_tests ... Add cmd module integration tests for windows and fix space in path issue	2018-08-03 17:03:32 -04:00