86775 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnson	764969ce08	Add a test to confirm that .py files are still loaded correctly ... Also, use USE_IMPORTLIB to gate testing on optimization_order, since this only works with Python 3.5+.	2018-08-08 11:22:52 -05:00
Erik Johnson	0f60beb6b6	Fix bad copypasta	2018-08-08 11:22:52 -05:00
Erik Johnson	fbcd142ea2	Add configuration docs for optimization_order config option	2018-08-08 11:22:52 -05:00
Erik Johnson	8af2d580f3	Only compile the suffix_order/map once per LazyLoader instance ... The values that dictate this are module-level globals, so repeating this every time we refresh the file mapping is unnecessary.	2018-08-08 11:22:52 -05:00
Erik Johnson	4b95e5f313	Don't put __pycache__ dir in the file list ... This prevents the loader from needlessly trying to process it (which will fail anyway since it's not a file).	2018-08-08 11:22:52 -05:00
Erik Johnson	e7c10196da	Quiet the byte compiling for PY2	2018-08-08 11:22:52 -05:00
Erik Johnson	9338370477	Add unit tests for loader optimization levels	2018-08-08 11:22:52 -05:00
Erik Johnson	c3622933c1	PY3: Support different optimization levels ... This uses the optimization_order config option to control which module is loaded when multiple optimization levels have been installed.	2018-08-08 11:22:52 -05:00
Erik Johnson	6fc8da5bab	Add optimization_order config option with default value	2018-08-08 11:22:51 -05:00
Erik Johnson	dfe423a1e0	Remove commented-out log message	2018-08-08 11:22:51 -05:00
Nicole Thomas	b49eeca6e9	Merge pull request #49003 from rallytime/boto-test-2017.7 ... Back-port #48999 to 2017.7	2018-08-08 11:35:48 -04:00
rallytime	1a23bb233f	Update expected return value in boto test ... The expected return from moto has changed from `-1` to `None` in the latest version of moto (1.3.4). This PR updates the test to be in line with the return from moto.	2018-08-08 10:42:57 -04:00
Nicole Thomas	41d9f11eb3	Merge pull request #48999 from rallytime/fix-boto-test ... Update expected return value in boto test	2018-08-08 10:42:14 -04:00
rallytime	23b66ef8bb	Skip test_jinja_deep_error on Debian 8 ... This is a flaky test on Debian 8, so let's skip it for now.	2018-08-08 10:36:56 -04:00
rallytime	d0136b1be5	Update expected return value in boto test ... The expected return from moto has changed from `-1` to `None` in the latest version of moto (1.3.4). This PR updates the test to be in line with the return from moto.	2018-08-08 09:16:55 -04:00
Nicole Thomas	51eed1fdfb	Merge pull request #48988 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2017.7.8 to 2017.7	2018-08-08 08:56:09 -04:00
AVeenstra	5e82685b89	Python 3 related fix in highstate_return.py ... In Python 3 key sets of dicts no longer support indexing: `TypeError: 'dict_keys' object does not support indexing`	2018-08-08 13:20:05 +02:00
rallytime	df8699e2e7	Merge branch '2017.7.8' into '2017.7' ... No conflicts.	2018-08-07 21:30:24 -04:00
Ashley Newton	5c1c311f77	Update Salt Conf ad	2018-08-07 13:49:26 -06:00
Ashley Newton	72dc63c426	Merge branch '2017.7' of https://github.com/saltstack/salt into new_logo_2017.7	2018-08-07 13:45:21 -06:00
Ashley Newton	9f4e78a7b9	Revert "Update saltconf ad" ... This reverts commit 3ab8cdb882.	2018-08-07 13:44:42 -06:00
Daniel Wallace	10fd4661ff	Merge pull request #48978 from gtmanfred/2017.7 ... clean up gemfile	2018-08-07 14:03:58 -05:00
Nicole Thomas	a1e54634dc	Merge pull request #48976 from rallytime/tornado ... Skip unreliable tornado tests	2018-08-07 14:55:24 -04:00
Ashley Newton	3ab8cdb882	Update saltconf ad	2018-08-07 12:40:34 -06:00
Nicole Thomas	22713be9c1	Merge pull request #48979 from rallytime/bp-48959 ... Back-port #48959 to 2017.7.8	2018-08-07 14:11:52 -04:00
Nicole Thomas	5b2423e527	Merge pull request #48959 from rallytime/flaky-tests ... Mark some more tests as flaky	2018-08-07 12:33:15 -04:00
Daniel Wallace	6108363f82	clean up gemfile ... Remove opennebula, since we are using docker and ec2 Pin winrm to the package since our changes have been released by upstream	2018-08-07 11:01:07 -05:00
rallytime	0bd838ab6c	Skip unreliable tornado tests ... Marked as flaky originally, but they're still flaky with undetermined race-conditions. These are skipped in 2018.3 and forward, so let's skip them here as well.	2018-08-07 11:22:18 -04:00
Nicole Thomas	03aa0e49b0	Merge pull request #48970 from Ch3LL/back_48962 ... [2017.7.8] Backport #48962	2018-08-07 11:01:56 -04:00
Nicole Thomas	e6cea5e3c7	Merge pull request #48968 from rallytime/man-pages ... Update man pages for 2017.7.8 release	2018-08-07 10:29:07 -04:00
Gareth J. Greenaway	3ce1b8a3c9	Update the elif block to only be true for versions below Debian 9.	2018-08-07 09:58:40 -04:00
rallytime	64fe3be41a	Update man pages for 2017.7.8 release	2018-08-07 09:35:01 -04:00
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
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
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
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	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
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
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	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