11242 Commits

Author	SHA1	Message	Date
rallytime	a9c16d9137	Fix test error in test_compiler jinja check ... The fix in #49002 was incomplete and when run on Debian, it hits a `ValueError` when the RELEASE variable is a string with a decimal. This change fixes the error.	2018-08-08 18:29:14 -04:00
Nicole Thomas	6b6d68c615	Merge pull request #49020 from rallytime/fix-grains-test ... Make grains integration test more robust	2018-08-08 16:59:18 -04:00
Nicole Thomas	92d6c25c7f	Merge pull request #49002 from rallytime/skip-jinja-deep-error-test ... Skip test_jinja_deep_error on Debian 8	2018-08-08 15:18:38 -04:00
rallytime	f72a3ac6be	Make grains integration test more robust ... The `test_grains_append_val_already_present` test can be flaky, especially on CentOS 7 when it gets bogged down. Let's give the test a little breathing room by adding a sleep so the grains.append calls don't stack up too quickly.	2018-08-08 14:58:05 -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	a1e54634dc	Merge pull request #48976 from rallytime/tornado ... Skip unreliable tornado tests	2018-08-07 14:55:24 -04: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
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
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	aaf986d728	Mark one grains test as flaky & convert to pytest notation	2018-08-06 15:03:27 -04:00
rallytime	e7e5abcf48	Mark 2 matcher tests as flaky	2018-08-06 14:47:44 -04: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
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
Nicole Thomas	0bb10107b6	Merge branch '2017.7' into 1045_test_pkg_015_installed_held_centos	2018-08-05 14:12:26 -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
Nicole Thomas	905da13653	Merge branch '2017.7' into cmd_win_tests	2018-08-03 15:10:29 -04:00
Nicole Thomas	f8bfab4f9f	Merge pull request #48890 from Ch3LL/cmd_test ... add sleep in test_cmd integration test	2018-08-02 15:15:07 -04:00
Nicole Thomas	52722f6ded	Merge pull request #48885 from rallytime/flaky-tests-shadow ... Mark shadow module integration test as flaky	2018-08-02 15:04:34 -04:00
Ch3LL	acda4ed9ab	add sleep in test_cmd integration test	2018-08-02 13:36:33 -04:00
Nicole Thomas	38d9eae537	Merge branch '2017.7' into flaky-tests-matchers	2018-08-02 13:29:57 -04:00
Nicole Thomas	0ca0b6f2f2	Merge pull request #48883 from terminalmage/salt-jenkins-1023 ... Fix failing git worktree tests	2018-08-02 12:51:39 -04:00
rallytime	da871a2d57	Mark shadow module integration test as flaky ... This test fails sometimes, so let's mark it as flaky. I have tried to reproduce the failure and fix it, but to no avail. Let's mark it as flaky for now.	2018-08-02 11:12:35 -04:00
rallytime	3660dff13c	Separate compound matcher tests into individual tests ... When one match fails (and some of these can be flaky) the whole test fails. This makes it somewhat difficult to track down why the test fails. I am hoping we won't need the sleeps in this change when the tests are separate, but let's see how that goes. It worked fine in my testing. I also updated the test to use pytest notation, rather than unittest.	2018-08-02 10:42:03 -04:00
Erik Johnson	c61f75cb50	Fix failing git worktree tests ... Git 2.18.0 changed the output format against which some of the asserts in this test are performed. Instead of displaying the full path to the worktree, it now references the branch name instead. This test updates the asserts to look for the basename instead, which should allow it to pass on Git releases both before and after 2.18.0.	2018-08-02 09:26:27 -05:00
Nicole Thomas	a84f5155a1	Merge pull request #48869 from Ch3LL/mac_shell_tests ... Catch socket.error exception in testprogram	2018-08-02 10:19:22 -04:00
Ch3LL	3734b1ec89	Catch socket.error exception in testprogram	2018-08-01 16:35:16 -04:00
rallytime	7320aa9104	Skip unreliable tornado test. ... Even with the flaky decorator, it still fails _sometimes_. This is not a useful test as it sits. Skipping it for now.	2018-08-01 15:46:03 -04:00
Ch3LL	9312a993a5	Add cmd module integration tests for windows and fix space in path issue	2018-08-01 14:05:52 -04:00
Nicole Thomas	05f2d65de3	Merge pull request #48853 from rallytime/bp-48850 ... Back-port #48850 to 2017.7	2018-07-31 16:21:48 -04:00
Nicole Thomas	8a1285239a	Merge pull request #48426 from garethgreenaway/46689_fixing_pkg_held_when_package_is_installed ... [2017.7] fixes to states/pkg.py	2018-07-31 16:18:04 -04:00
rallytime	3c33ee554a	Skip tests in integration.shell.test_master ... Related to https://github.com/saltstack/salt-jenkins/issues/378 This is likely causing all of the flakiness we're seeing on test runs when the master stops responding. These tests should be in their own, isolated run, rather than with the rest of the test suite.	2018-07-31 15:22:34 -04:00
Daniel Wallace	5b443af7ae	add key-deploy test	2018-07-31 13:36:43 -05:00
Gareth J. Greenaway	11cb86e6eb	General cleanup in pkg state, reducing duplicate code. Fixing the requires_salt_modules decorator, sys.doc was returning too much information for the event to handle. This change specifically calls sys.doc with the module name.	2018-07-31 09:46:05 -07:00
Gareth J. Greenaway	16fb6ae635	Make sure pkg.hold and pkg.unhold are available before running the test.	2018-07-31 09:46:05 -07:00
Gareth J. Greenaway	998651102d	Fixing a situation when a package is already installed via salt or manually and a state attempts to set that package to be held. Previously the holding/unholding logic was only being run against packages that were being installed. This change moves the holding logic outside and runs it against all desired packages. Adding a new test to test holding logic.	2018-07-31 09:46:05 -07:00
Orlando Richards	66936b4f41	Changed string comparison in pip test to match new confirmation string - ref PR #47734.	2018-07-29 21:32:24 +00:00
Nicole Thomas	2e00939a6e	Merge pull request #48788 from Ch3LL/timezone_windows ... Add timzeone windows integration tests and fix get_zone	2018-07-27 16:14:29 -04:00
Ch3LL	de95a6a215	add unused import to timezone test file	2018-07-27 15:42:35 -04:00
Nicole Thomas	8e61f3dce0	Merge pull request #48742 from frogunder/45014 ... add windows integration tests for states.file	2018-07-27 09:57:26 -04:00
William Giokas	d4ca0e3a97	test: except for OSError only	2018-07-26 17:27:02 -04:00
Ch3LL	f09d1a2c7e	Add timzeon windows integration tests and fix get_zone	2018-07-26 16:44:55 -04:00
Frode Gundersen	f08058b043	Merge branch '45014' of https://github.com/frogunder/salt into 45014	2018-07-26 20:09:17 +00:00
Frode Gundersen	33c20c1ec0	fix tests	2018-07-26 20:04:51 +00:00
Frode Gundersen	757fde70c6	Merge branch '2017.7' into 45014	2018-07-24 11:07:14 -06:00
Frode Gundersen	a7a914060d	add windows integration tests for states.file	2018-07-24 16:42:07 +00:00
Nicole Thomas	ce4e22224e	Merge pull request #48720 from Ch3LL/mac_file_path ... Fix test_managed_source_hash_indifferent_case on macosx to correct tmp path	2018-07-23 18:32:56 -04:00
Ch3LL	01d25fae19	Fix test_managed_source_hash_indifferent_case on macosx to correct tmp path	2018-07-23 15:02:27 -04:00