Commit Graph

2179 Commits

Author SHA1 Message Date
rallytime
dd413f495d Move integration import after ensure_in_syspath call 2015-02-06 12:49:28 -07:00
rallytime
e256943fd6 Pylint fix for develop 2015-02-06 10:04:52 -07:00
rallytime
eaa879a64e Python 3 compat for tests/integration/loader/globals.py 2015-02-06 07:48:20 -07:00
rallytime
385792727b Moved tests/unit/loader.py to tests/integration/loader/loader.py
These are integration tests and not unit tests, so they should be
in the proper directory.

Also, fixed up the python 3 incompatability pylint errors.
2015-02-06 07:28:43 -07:00
Thomas Jackson
f01a5c5fbd Pylint 2015-02-05 12:17:48 -08:00
Thomas Jackson
307e5c1473 Check that __context__ is always present, since it now is (properly) 2015-02-05 09:20:30 -08:00
Thomas Jackson
b23a076e11 Remove grains outputter
Its been broken for ~8 months (or more), and its been falling back to nested. Since nested does (IMO) a better job displaying the data and is generic, there is no reason to get this working-- esp since we've already "deprecated" it, by it not working

Conflicts:

	salt/output/grains.py
2015-02-05 09:20:29 -08:00
Thomas Jackson
509b4352f2 Pack modules to runners 2015-02-05 09:20:27 -08:00
Justin Findlay
7c943ec8a7 only add successfully generated ssh keys to config 2015-02-04 16:16:41 -07:00
rallytime
759ce02829 Pylint fix for 2015.2 2015-02-03 10:02:05 -07:00
Mike Place
68418d79a7 Typo 2015-02-02 13:52:26 -07:00
Mike Place
5291cf7809 Better detection for minimum pyzmq version 2015-02-02 13:52:26 -07:00
Thomas S Hatch
cefb78efe9 Merge pull request #17883 from s0undt3ch/features/pylint-py3-modernize
[Don't merge yet] Py3 compat changes & Update pylintrc to load the py3modernize plugin
2015-01-31 03:13:53 -07:00
rallytime
310e9075bf Pylint disable StrictVersion import error 2015-01-30 17:32:17 -07:00
Mike Place
710bb63103 Typo 2015-01-30 16:02:56 -07:00
Mike Place
69c5e1f904 Better detection for minimum pyzmq version 2015-01-30 16:01:59 -07:00
Pedro Algarvio
34c75b1a8d The dictionary changes while iterating. Run over a list of keys. 2015-01-30 22:27:14 +00:00
Pedro Algarvio
ac15f12349 Py3 compatibility 2015-01-30 22:27:10 +00:00
Pedro Algarvio
4a25daa211 Py3 compatibility 2015-01-30 22:27:10 +00:00
Pedro Algarvio
ff636249f4 Py3 compatibility 2015-01-30 22:27:10 +00:00
Pedro Algarvio
6b0c88e3bf Py3 compatibility 2015-01-30 22:27:05 +00:00
Pedro Algarvio
ca06f278eb Py3 compatibility fixes. 2015-01-30 22:25:31 +00:00
Pedro Algarvio
5dab3e0d7d Py3 compatibility fixes. 2015-01-30 22:25:29 +00:00
Pedro Algarvio
dc2d3b8ba2 The imports do work! 2015-01-30 22:25:29 +00:00
Pedro Algarvio
788bb913c6 Py3 compatibility fixes. 2015-01-30 22:25:28 +00:00
Pedro Algarvio
79be964dc2 We need to write something, even an empty string 2015-01-30 22:25:19 +00:00
Pedro Algarvio
e6ab1d4ba1 Fix import 2015-01-30 22:25:19 +00:00
Pedro Algarvio
fdd2a3e246 Correct the iteration 2015-01-30 22:25:19 +00:00
Pedro Algarvio
403abc88e1 Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
91d185153c Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
5d570561fd Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
665127c932 Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
fda912f2d8 Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
7360164558 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
fcd9832863 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
ec93519312 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
f07427a0ed Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
b54c02930f Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
8fa37d65eb Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
cb6531293c Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
b555ddf658 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
b791dd6971 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
81ae50fac0 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
eca6f730db Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
207f3ddbf1 Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
4ae7e918e9 Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
f5928068b3 Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
3624b911b3 Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
3f24dcfa80 Import six at a later stage 2015-01-30 22:25:07 +00:00
Pedro Algarvio
fdc467b587 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
a4e48e8873 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
2d8b216bcd Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
f59d669a58 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
4eadb88bfa Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
0bc44131e8 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
0577610258 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
dd146ca3e5 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
5bc0c157b6 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
rallytime
9898fcf613 Merge branch '2015.2' into 'develop'
Conflicts:
	.gitignore
	.pylintrc
	.testing.pylintrc
	salt/client/mixins.py
	salt/cloud/clouds/msazure.py
	salt/config.py
	salt/modules/mount.py
	salt/runners/doc.py
	salt/utils/event.py
	salt/utils/reactor.py
2015-01-29 17:24:04 -07:00
rallytime
c65d9673a7 Merge branch '2014.7' into merge_forward_fifteen_second_try
Conflicts:
	salt/states/file.py
2015-01-29 13:42:49 -07:00
Thomas Jackson
3d1ae49d09 Pass opts not an ImmutableDict of opts 2015-01-28 18:43:45 -08:00
Thomas Jackson
645027c0fe cleanup "Caste jid as str (its an int all over), and change runner tag to correct prefix"
This reverts most of commit 745f2d84835ae23800358cd4dcc9c8525b502714.

apparently I picked up some other changes I didn't mean to

Conflicts:
	salt/utils/event.py
	tests/integration/utils/test_reactor.py
2015-01-28 18:43:43 -08:00
Thomas Jackson
5bfef71240 Pylint fix 2015-01-28 18:43:43 -08:00
Thomas Jackson
d8e8de2a19 Caste jid as str (its an int all over), and change runner tag to correct prefix
Conflicts:

	salt/utils/event.py
2015-01-28 18:43:40 -08:00
Mike Place
7c066c38a0 Increae default runner timeout to 60s 2015-01-28 13:56:41 -07:00
Thomas Jackson
4db02487f1 Pass opts not an ImmutableDict of opts 2015-01-27 13:11:01 -08:00
rallytime
dc23823897 Merge branch '2014.7' into '2015.2'
Conflicts:
	salt/modules/localemod.py
2015-01-27 13:24:14 -07:00
Thomas S Hatch
bf397d12b3 Merge pull request #20094 from basepi/merge-forward-develop
Merge forward from 2015.2 to develop
2015-01-27 10:04:51 -07:00
Colton Myers
c4da7bdd64 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
	salt/client/mixins.py
	salt/daemons/flo/__init__.py
2015-01-26 19:44:59 -07:00
Mike Place
0b38efaaad Increae default runner timeout to 60s 2015-01-26 10:59:55 -07:00
rallytime
299374a211 Change image name in rackspace profile config to a valid one 2015-01-24 20:14:23 -07:00
Pedro Algarvio
a6c3915049 Fix order for proper diff on failure 2015-01-24 03:16:51 +00:00
Mike Place
09d3d62174 Loosen test constraint and update runas arg 2015-01-24 03:16:50 +00:00
Mike Place
e7d959b6a5 Even MORE test fixing 2015-01-24 03:16:50 +00:00
Mike Place
7222d741de Even more pip test fixing 2015-01-24 03:16:50 +00:00
rallytime
69d7a6ebd0 Pylint fixes for the 2015.2 branch 2015-01-23 10:57:18 -07:00
Thomas S Hatch
9cdbf2b2f7 Merge pull request #19972 from rallytime/bp-19746
Backport #19746 to 2015.2
2015-01-22 17:55:27 -07:00
Mathias Gug
4670988a68 Fix style. 2015-01-22 14:41:05 -07:00
Mathias Gug
3b285798e3 Fix style. 2015-01-22 14:40:58 -07:00
Mathias Gug
dd097b730d Fix style issues. 2015-01-22 14:40:49 -07:00
Mathias Gug
4542072c4e Add boto_sns module and state.
Include integration tests.
2015-01-22 14:40:32 -07:00
Mathias Gug
a454d71bd5 Fix coding style. 2015-01-22 14:24:30 -07:00
Mathias Gug
adf4c7a1af Skip boto_iam integration tests if boto is not available
or properly configured.
2015-01-22 14:24:30 -07:00
Mathias Gug
6a18c71f1d Add comment. 2015-01-22 14:24:29 -07:00
Mathias Gug
0d158cfa12 Add get_account_id function boto_iam
so that we can retrieve the AWS account id associated with the
credentials used to connect to AWS.
2015-01-22 14:24:29 -07:00
Mathias Gug
f4c75375f4 Make sure boto_sns state is idempotent. 2015-01-22 12:13:33 -08:00
Mathias Gug
85ec021a73 Merge remote-tracking branch 'upstream/develop' into support-sns-subscriptions
Conflicts:
	tests/integration/states/boto_sns.py
2015-01-22 11:11:51 -08:00
Mathias Gug
b79756bdd5 Support subscriptions in sns topic state. 2015-01-22 11:04:31 -08:00
Pedro Algarvio
8dbb7394b2 White-space lint fix 2015-01-21 14:17:03 +00:00
Pedro Algarvio
b0920b226e We still support Python 2.6, so, we need indexes. 2015-01-21 02:11:48 +00:00
Thomas S Hatch
8bfb79c8d9 Merge pull request #19812 from matthew-muscat/develop
Update hosts file creation for consistency and improved readability
2015-01-20 14:52:01 -07:00
Thomas S Hatch
1569520a4b Merge pull request #19792 from rallytime/merge_forward_develop
Merge 2015.2 forward into develop
2015-01-17 09:39:02 -07:00
Matthew Muscat
f44d67471d Update hosts module test
Update test case to account for formatting changes in b82001fcd4
2015-01-18 00:33:00 +11:00
Thomas S Hatch
fab600add9 Merge pull request #19746 from lyft/add-boto-sns-module
Add boto_sns module and state.
2015-01-16 16:58:09 -07:00
Chris Rebert
19e262bb7b Fix typos with the help of https://github.com/vlajos/misspell_fixer 2015-01-16 13:35:47 -08:00
rallytime
d724ed3a47 Merge branch '2015.2' into 'develop'
Conflicts:
	salt/cli/batch.py
	salt/cloud/clouds/msazure.py
	tests/integration/netapi/rest_tornado/test_app.py
2015-01-16 11:36:32 -07:00
Mathias Gug
64cf74ebaa Fix style. 2015-01-14 16:05:36 -08:00
Mathias Gug
6ffc9f827e Fix style. 2015-01-14 16:04:25 -08:00
Mathias Gug
e5ab359bdd Fix style issues. 2015-01-14 16:02:50 -08:00
Mathias Gug
6f9fbe23d6 Add boto_sns module and state.
Include integration tests.
2015-01-14 15:43:06 -08:00
Mathias Gug
97d0f93fd3 Fix coding style. 2015-01-14 13:06:43 -08:00
Erik Johnson
175ba127be Merge branch '2014.7' into 2014.7-2015.2
Conflicts:
	salt/modules/archive.py
2015-01-14 14:26:22 -06:00
Mathias Gug
30625a0437 Skip boto_iam integration tests if boto is not available
or properly configured.
2015-01-14 11:49:54 -08:00
Mathias Gug
61eeac5465 Add comment. 2015-01-14 11:12:23 -08:00
Mathias Gug
3ff36a9692 Add get_account_id function boto_iam
so that we can retrieve the AWS account id associated with the
credentials used to connect to AWS.
2015-01-14 11:08:54 -08:00
Mike Place
c172470c30 Try giving some rest tornado requests a little more time 2015-01-13 14:17:55 -07:00
Thomas S Hatch
f1391fb8d9 Merge pull request #19667 from cachedout/ssh_tests
Fix tests
2015-01-13 08:14:34 -07:00
Mike Place
fc9a647a3b Remove assert: 2015-01-12 18:53:56 -07:00
Mike Place
cba0d6d597 Fix tests 2015-01-12 16:01:10 -07:00
Mike Place
74501f56ae Fix tornado tests
The tornado test runner isn't respecting timeouts as it claims it
should in async mode. However, the env variable is working as-described.
2015-01-12 15:36:34 -07:00
Thomas S Hatch
c79871e77d Merge pull request #19637 from s0undt3ch/develop
Merge branch '2015.2' into develop
2015-01-12 11:33:14 -07:00
Pedro Algarvio
c3bc043b23 Merge branch '2015.2' into develop
Conflicts:
	salt/syspaths.py
	setup.py
	tests/integration/__init__.py
2015-01-11 22:45:35 +00:00
Pedro Algarvio
9d0fe5b1d1 Merge branch '2014.7' into 2015.2
Conflicts:
	salt/modules/brew.py
	tests/integration/__init__.py
2015-01-11 22:40:16 +00:00
Thomas Jackson
e35c7ac313 cleanup "Caste jid as str (its an int all over), and change runner tag to correct prefix"
This reverts most of commit 745f2d84835ae23800358cd4dcc9c8525b502714.

apparently I picked up some other changes I didn't mean to

Conflicts:
	salt/utils/event.py
	tests/integration/utils/test_reactor.py
2015-01-10 16:32:24 -08:00
Thomas Jackson
d352057f11 Pylint fix 2015-01-10 16:31:59 -08:00
Thomas Jackson
c17462d062 Caste jid as str (its an int all over), and change runner tag to correct prefix 2015-01-10 16:30:00 -08:00
Mike Place
0e935486de Merge pull request #19605 from jacksontj/develop
Fixes for develop
2015-01-10 08:54:59 -07:00
Thomas Jackson
925afac98d Temporarily change this test to work around race condition in the runnerclient
@rallytime If you have some list of tests that are disabled that shouldn't be, this is one for the list :)
2015-01-10 00:18:16 -08:00
Mike Place
1277b71e2d Typo 2015-01-09 21:22:40 -07:00
Mike Place
7d4123c6b3 Async flag and test cleanup 2015-01-09 21:21:50 -07:00
Thomas S Hatch
98cc0f88b4 Merge pull request #19585 from cachedout/async_flag_for_test_run
Async flag for test run
2015-01-09 17:50:52 -07:00
Mike Place
7aec24e8e1 Typo 2015-01-09 13:26:25 -07:00
Mike Place
9d7990f264 Async flag and test cleanup 2015-01-09 13:14:33 -07:00
rallytime
d6b3f69c19 Cleaner and actual fix for the failing weird pip test for CentOS 5 2015-01-09 13:10:09 -07:00
Colton Myers
3ce5eb2838 Merge branch '2014.7' into merge-forward-2015.2
Conflicts:
	salt/modules/archive.py
	salt/modules/brew.py
	salt/modules/pip.py
	tests/unit/modules/archive_test.py
	tests/unit/modules/pip_test.py
2015-01-09 11:39:09 -07:00
rallytime
28cb062697 Cleaner and actual fix for the failing weird pip test for CentOS 5 2015-01-09 10:52:55 -07:00
rallytime
ea769829af Fix my pylint errors 2015-01-08 15:09:55 -07:00
rallytime
41841701e7 Fix djangomod.py integration test failures 2015-01-08 12:57:11 -07:00
Mike Place
ca9a871d43 Merge pull request #19536 from rallytime/pip_test_fix
Don't run weird pip install test on CentOS 5
2015-01-08 12:21:08 -07:00
rallytime
71ef3f7744 Keep package name the same 2015-01-08 12:13:26 -07:00
rallytime
a0f801f475 Skip this test when we are running on centOS 5 2015-01-08 12:11:51 -07:00
Colton Myers
a60fa6b3d1 Merge branch '2015.2' into develop 2015-01-08 11:29:08 -07:00
Mike Place
d6ce858c23 Try giving some rest tornado requests a little more time 2015-01-08 10:04:19 -07:00
rallytime
5490530504 Change the install package to fix pip tests 2015-01-08 09:32:53 -07:00
rallytime
74a1861655 Merge branch '2015.2' into merge_forward_develop 2015-01-07 17:01:25 -07:00
Colton Myers
70489c62a7 Merge branch '2014.7' into merge-forward-2015.2
Conflicts:
	salt/modules/cron.py
	salt/modules/rabbitmq.py
	salt/modules/smf.py
	salt/modules/upstart.py
	salt/modules/useradd.py
	salt/modules/zpool.py
	salt/pillar/git_pillar.py
2015-01-07 14:49:58 -07:00
rallytime
4e87557748 --local is not available in older versions of git
Also adjust the tests:
    subprocess.check_output is only available in python 2.7
2015-01-07 11:56:43 -07:00
rallytime
fe4fd7a5a3 Use skip_if_binaries_missing decorator 2015-01-07 10:11:26 -07:00
rallytime
194c0696aa Fix my pylint errors 2015-01-06 17:27:38 -07:00
Seth House
e96654744f Added test for git_pillar branch to env mappings 2015-01-06 16:51:58 -07:00
rallytime
ed3a34624c Fix djangomod.py integration test failures 2015-01-06 22:26:46 +00:00
Colton Myers
c5cdc575d0 Merge branch '2015.2' into merge-forward-develop
Conflicts:
	salt/utils/reactor.py
	tests/jenkins-ng.py
2015-01-06 14:16:15 -07:00
Colton Myers
f6eae029f0 Merge branch '2014.7' into merge-forward-2015.2
Conflicts:
	pkg/windows/installer/Salt-Minion-Setup.nsi
	salt/grains/core.py
	salt/minion.py
	salt/modules/mongodb.py
	salt/states/archive.py
	salt/states/mount.py
	salt/utils/master.py
	salt/utils/schedule.py
	salt/utils/thin.py
	tests/jenkins-ng.py
2015-01-06 13:14:27 -07:00
rallytime
f6243f0b80 Fix the test in the correct place... 2015-01-05 15:36:45 -07:00
rallytime
4a62c2b860 Fix pip state test failure 2015-01-05 15:20:18 -07:00
Mike Place
f44e46d080 Adjust batch test 2015-01-05 10:04:15 -07:00
rallytime
57514d824b Fix pylint on 2014.7 branch 2015-01-03 21:44:09 -07:00
Justin Findlay
751e0c7f43 update color name consistency 2014-12-27 12:20:08 -07:00
Justin Findlay
4748156ed9 update cmdmod integration tests 2014-12-23 13:59:25 -07:00
Mike Place
7ff6c22b9b Remove deprecated tests 2014-12-19 11:37:56 -07:00
Colton Myers
43df12b6cc Merge branch '2014.7' into merge-forward
Conflicts:
	salt/client/ssh/shell.py
	salt/modules/file.py
	tests/integration/states/file.py
2014-12-18 10:32:19 -07:00
Elias Probst
5a6811759f Fix tests for #18841. 2014-12-18 01:51:26 +01:00
Elias Probst
a2e52dd5fc Fix tests for #18841. 2014-12-18 01:51:08 +01:00
Elias Probst
e82c6ba7c0 Add missing line. 2014-12-18 01:50:39 +01:00
Thomas S Hatch
c2c9e56b82 Merge pull request #18931 from cachedout/cli_refactor
Refactor the entire CLI out of __init__
2014-12-17 14:37:13 -07:00
Thomas S Hatch
6263382858 Merge pull request #18918 from cachedout/salt_cli_retcode
Make salt cli return a non-zero error code if an error occurred
2014-12-17 14:36:51 -07:00
Elias Probst
6363aa22ac Add integration tests for 'modules.file.replace()'. 2014-12-17 12:06:58 +01:00
Mike Place
67150306b6 Fix version test 2014-12-15 13:13:42 -07:00
Mike Place
302d5cab39 Fix failing test 2014-12-15 12:04:35 -07:00
Mike Place
a8ab27df4c Make tests run 2014-12-15 11:36:19 -07:00
Pedro Algarvio
71df7ac58a Skip tests which require the SSHD server running in case it's not 2014-12-13 00:11:41 +00:00
Elias Probst
2fe5e0309c Typo (assertInSalStatetWarning → assertInSaltStateWarning). 2014-12-10 21:04:11 +01:00
Pedro Algarvio
a985f0ac4e Disable some Pylint errors 2014-12-01 03:23:52 +00:00
Pedro Algarvio
14cc8931ed Disable some Pylint errors 2014-11-28 15:30:05 +00:00
Pedro Algarvio
733b31da23 Merge branch '2014.7' into develop
Conflicts:
	tests/unit/modules/hashutil_test.py
	tests/unit/templates/jinja_test.py
2014-11-27 03:59:40 +00:00
Pedro Algarvio
78bc5107ee Switch open() for salt.utils.fopen() 2014-11-26 23:38:34 +00:00
Pedro Algarvio
62ec46d6dd Switch open() for salt.utils.fopen() 2014-11-26 23:37:01 +00:00
Pedro Algarvio
d957d2e911 Switch open() for salt.utils.fopen() 2014-11-26 23:36:26 +00:00
Pedro Algarvio
bea345e720 Switch open() for salt.utils.fopen() 2014-11-26 23:35:31 +00:00
Pedro Algarvio
1857a0d31f Switch open() for salt.utils.fopen() 2014-11-26 23:30:18 +00:00
Pedro Algarvio
8735242906 We need to call read()! 2014-11-26 23:13:19 +00:00
Pedro Algarvio
1eeb02d93f Add a missed with 2014-11-26 21:07:39 +00:00
Pedro Algarvio
47edf6fc89 Fix the with context 2014-11-26 20:49:04 +00:00
Pedro Algarvio
bfe99dbb3f Merge branch '2014.7' into develop
Conflicts:
	salt/cloud/__init__.py
	salt/modules/file.py
	salt/modules/zcbuildout.py
	salt/runners/lxc.py
	salt/runners/manage.py
2014-11-26 20:14:56 +00:00
Pedro Algarvio
2d210b9055 Switch open() for salt.utils.fopen() 2014-11-26 18:33:22 +00:00
Pedro Algarvio
89befb8827 Switch open() for salt.utils.fopen() 2014-11-26 18:02:24 +00:00
Pedro Algarvio
b5cda75a8c Switch open() for salt.utils.fopen() 2014-11-26 18:01:35 +00:00
Pedro Algarvio
ea717d2422 Switch open() for salt.utils.fopen() 2014-11-26 17:59:52 +00:00
Pedro Algarvio
d27c38d28f Switch open() for salt.utils.fopen() 2014-11-26 17:57:57 +00:00
Pedro Algarvio
70b657af20 Switch open() for salt.utils.fopen() 2014-11-26 17:56:43 +00:00
Pedro Algarvio
46ea34b4f5 Switch open() for salt.utils.fopen() 2014-11-26 17:55:30 +00:00
Pedro Algarvio
32b2f2e05f Switch open() for salt.utils.fopen() 2014-11-26 17:54:29 +00:00
Pedro Algarvio
2127a98667 Switch open() for salt.utils.fopen() 2014-11-26 17:52:46 +00:00
Pedro Algarvio
9230f5b5ee Switch open() for salt.utils.fopen() 2014-11-26 17:50:47 +00:00
Pedro Algarvio
753338e078 Switch open() for salt.utils.fopen() 2014-11-26 17:49:27 +00:00
Pedro Algarvio
2a597da207 Switch open() for salt.utils.fopen() 2014-11-26 17:47:05 +00:00
Pedro Algarvio
6b72255e9b Switch open() for salt.utils.fopen() 2014-11-26 17:46:13 +00:00
Pedro Algarvio
5dfddc88a4 Switch open() for salt.utils.fopen() 2014-11-26 17:39:49 +00:00
Pedro Algarvio
0723b24feb Switch open() for salt.utils.fopen() 2014-11-26 17:39:18 +00:00
Thomas S Hatch
d416b8b1b8 gix tornado merge conflict 2014-11-26 09:25:47 -07:00
Thomas S Hatch
6aa5b0f858 Merge branch '2014.7' into develop
Conflicts:
	salt/modules/genesis.py
	salt/modules/parted.py
	salt/modules/win_service.py
	salt/runner.py
	salt/states/file.py
	tests/integration/netapi/rest_tornado/test_app.py
2014-11-26 09:24:24 -07:00
Pedro Algarvio
50c437f8c5 Use atexit for the cleanup 2014-11-26 00:41:02 +00:00
Pedro Algarvio
593544b577 Move cleanup_runtime_config_instance out of TestDaemon 2014-11-26 00:20:27 +00:00
rallytime
eeab98c3be Skip tornado tests if we can't import ZMQIOLoop
Tornado tests were failing on Ubuntu 10 and 12 because they don't have
a new enough version of PyZMQ to use the ioloop.current function.
2014-11-25 13:06:33 -07:00
Mike Place
d746bb272c Run runner tests async 2014-11-24 20:48:04 -07:00
Pedro Algarvio
e8104167f4 Forced clean up of runtime config dictionary which includes a local client 2014-11-25 00:33:45 +00:00
Colton Myers
dc43840cee Merge branch '2014.7' into merge-forward
Conflicts:
	salt/modules/glusterfs.py
	salt/modules/macports.py
	salt/modules/makeconf.py
	salt/modules/mdadm.py
	salt/modules/smartos_vmadm.py
	salt/modules/zypper.py
	salt/utils/event.py
	tests/integration/netapi/rest_tornado/test_app.py
	tests/unit/netapi/rest_tornado/test_handlers.py
2014-11-21 12:05:32 -07:00
Thomas Jackson
0a1b88e6b5 Change all saltnado asserts to unittest asserts. This way when there is a failure you get nice pretty printouts! 2014-11-20 18:35:41 -08:00
Pedro Algarvio
0c50d789b7 The imports actually work so shut up PyLint! 2014-11-20 18:22:19 +00:00
Pedro Algarvio
10a9c479ff Remove unused import 2014-11-20 16:45:36 +00:00
Pedro Algarvio
5cf320f45f Allow the tests to be skipped 2014-11-20 16:40:47 +00:00
Pedro Algarvio
e45033b993 Make PyLint ignore unused imports 2014-11-20 16:40:47 +00:00
Pedro Algarvio
6b19c7b03e Use urlencode from six 2014-11-20 16:40:45 +00:00
Pedro Algarvio
a802d8f7f5 Use the skip_if_binaries_missing_helper 2014-11-20 16:40:38 +00:00
rallytime
e70537eb2c Fix missing cls variable and add some docstring info 2014-11-20 09:15:56 -07:00
Thomas Jackson
c68066d60b Decrease timeout to fit into "long", before this timeout wasn't passed anywhere, but now that it is it has to fit into a C long otherwise you get errors like:
"OverflowError: Python int too large to convert to C long"
2014-11-20 07:46:13 -08:00
Jonathan Ballet
a6c3499749 Please pylint
My patch #18221 yesterday introduced new Pylint warnings/errors.

This fixes these warnings.
2014-11-19 19:28:28 +01:00
Thomas S Hatch
873d1c1803 Merge pull request #18221 from multani/fix/git-config-set-shell-escape
Fix Git's config set with values containing white spaces.
2014-11-18 17:14:43 -07:00
Jonathan Ballet
97959959ca Add future's absolute import to fix importation of git in tests
Tests in pillar.py are importing the "git" module, which is supposed to
be "GitPython", bt since Python 2.x doesn't use absolute import by
default, it imports the "git" submodule, which defines the tests for the
Git module of Salt, instead.
2014-11-18 22:46:35 +01:00
Colton Myers
716a7e3331 Merge branch '2014.7' into merge-forward
Conflicts:
	salt/modules/bsd_shadow.py
	salt/modules/freebsdjail.py
	salt/modules/yumpkg.py
	salt/modules/zfs.py
	salt/modules/zypper.py
	salt/netapi/rest_tornado/saltnado.py
	salt/states/dockerio.py
2014-11-18 12:46:29 -07:00
Jonathan Ballet
38bb70d398 Fix Git's config set with values containing white spaces.
The Salt function 'git.config_set' and the state 'git.config' (which relies
on the former) don't escape the value to be set in the configuration file
passed by Salt. For example, this doesn't work:

  mylocalrepo:
    git.config:
      - name: user.name
      - value: "Jonathan Ballet"
      - repo: file://my/path/to/repo

This set the 'user.name' configuration value to "Jonathan" only.
(Additionally, the state discovers that the value set is not the one
specified, and keeps trying to set the right value, which ends up with lot
of "name = Jonathan" into the "[user]" section of Git's config file.)

This commit fixes the problem and adds some unit tests to verify it's
working properly.
2014-11-18 20:02:24 +01:00
Thomas Jackson
837a8ed475 Move EventListener over to ZMQStreams 2014-11-17 08:24:28 -08:00
Thomas Jackson
f7adfb44e9 Increase timeout from 5s to 10s, since jenkins seems to have issues calling runners in 5s 2014-11-14 18:08:44 -08:00
rallytime
652d4b4803 Fix up the linux_acl test that is failing 2014-11-14 15:40:12 -07:00
Thomas Jackson
ea8b4bb479 Make sure to only cleanup the tag_map in the case that you timeout the future 2014-11-14 11:47:35 -08:00
Thomas Jackson
e2102fcbc7 Pylint cleanup 2014-11-14 09:15:54 -08:00
Thomas Jackson
6f0552c9e1 Pylint fixes 2014-11-13 09:33:14 -08:00
Thomas Jackson
9e61037b0d Cleanup, and fix exp_form override-- we need to do it after the ping to minions 2014-11-13 08:36:28 -08:00
Thomas Jackson
ce22427071 Remove timeout test since that no longer valid 2014-11-13 08:36:28 -08:00
Thomas Jackson
31b54762b0 Add tests for multi-post and multi-token 2014-11-13 08:36:28 -08:00
Thomas Jackson
a259f2149b Move syndic_wait_done into base class (more than one func need it)
Change local_batch to just call local to get the minion list
2014-11-13 08:36:28 -08:00
Thomas Jackson
522090a8c8 Rework local to ping minions, and wait a min of syndic_wait (if a syndic) 2014-11-13 08:36:28 -08:00
Thomas Jackson
9d4784f835 Update todo marker 2014-11-13 08:36:28 -08:00
Thomas Jackson
8cd7b06b36 Change disbatch to handle different clients per lowstate chunk 2014-11-13 08:36:27 -08:00
Thomas Jackson
1131522eb5 Update TODO marker 2014-11-13 08:36:27 -08:00
Thomas Jackson
b99e189468 Add tests for WebhookSaltAPIHandler 2014-11-13 08:36:27 -08:00
Thomas Jackson
2d9b1df95d Add tests for EventsSaltAPIHandler 2014-11-13 08:36:27 -08:00
Thomas Jackson
847df0fad6 Add RunSaltAPIHandler tests 2014-11-13 08:36:27 -08:00
Thomas Jackson
bd58ca8fa0 Add Jobs api endpoint tests 2014-11-13 08:36:27 -08:00
Thomas Jackson
f0f9b14ee2 Add tests for MinionSaltAPIHandler 2014-11-13 08:36:27 -08:00
Thomas Jackson
cd01c9a1d6 Add check for the redirect location 2014-11-13 08:36:27 -08:00
Thomas Jackson
8bd72aeb4f Add test for unauthorized access 2014-11-13 08:36:27 -08:00
Thomas Jackson
7ef2537842 Finished basic tests for base SaltAPIHandler 2014-11-13 08:36:27 -08:00
Nicole Thomas
d54fbe8887 Merge pull request #17866 from jfindlay/netapi_known_jid_test
integration test: known JID through netapi #15763
2014-11-13 09:17:45 -07:00
Chris Rebert
67b3e19690 tests/integration/__init__.py: salt._compat => six 2014-11-11 14:36:25 -08:00
Justin Findlay
b097a1e16b pre-emptive pylint fix0r 2014-11-11 15:22:40 -07:00
Justin Findlay
abb3ba87bf integration test: known JID through netapi #15763 2014-11-11 15:15:36 -07:00
Chris Rebert
478e406001 replace salt._compat.string_types with six.string_types 2014-11-11 13:45:52 -08:00
Mike Place
da163471af Fix up tests 2014-11-10 15:42:45 -07:00
Pedro Algarvio
4235d15184 Merge branch '2014.7' into develop 2014-11-07 21:47:49 +00:00
Pedro Algarvio
31d3b7b955 Revert "Freeze the testing runtime configs at a latter stage"
This reverts commit 5da3ad341b.
2014-11-07 20:39:49 +00:00
Pedro Algarvio
ea89edf3d8 Switch run_ssh with run_function 2014-11-06 23:58:40 +00:00
Pedro Algarvio
b425c20919 2 of 500000
Let's not hardcode the SSH tests to the root user without the need for
that.
2014-11-06 19:42:59 +00:00
Pedro Algarvio
1b2e16a19e Merge branch '2014.7' into develop 2014-11-05 22:47:06 +00:00
Pedro Algarvio
5da3ad341b Freeze the testing runtime configs at a latter stage 2014-11-05 22:42:38 +00:00
Thomas S Hatch
c8bfd87105 Merge pull request #17153 from rallytime/merge_forward
Merge 2014.7 into develop
2014-11-04 15:03:28 -07:00
rallytime
b49c677af8 Merge branch '2014.7' into merge_forward
Conflicts:
	salt/daemons/flo/core.py
	salt/daemons/salting.py
	salt/minion.py
	salt/modules/introspect.py
	salt/modules/lxc.py
	salt/modules/sysmod.py
	salt/runners/doc.py
	salt/states/cloud.py
	salt/transport/__init__.py
	salt/utils/github.py
2014-11-04 10:07:02 -07:00
Roman Inflianskas
fb5e86aaa1 modules.linux_acl: satisfy pylint 2014-11-04 16:17:35 +03:00
Roman Inflianskas
83b760db44 modules.linux_acl: add integration tests 2014-11-04 14:45:23 +03:00
rallytime
92fc46607f Don't use HVM image type. 2014-11-03 16:12:21 -07:00
rallytime
e272c41bb8 Use Ubuntu 14 image for ec2 cloud tests instead of RHEL 6 2014-11-03 15:13:14 -07:00
Colton Myers
0cc0d64136 Merge branch '2014.7' into develop
Conflicts:
	salt/modules/hg.py
2014-10-31 16:14:34 -06:00
Nicole Thomas
573390d8ad Merge pull request #17054 from jacksontj/2014.7
Fix for #17051
2014-10-31 10:14:16 -06:00
Thomas Jackson
6262d44d50 Add "normalize_ret" function, so we don't have to copy/paste so much
Add checks for "changes" since we want to test cases where there aren't changes to be made
2014-10-30 16:58:03 -07:00
Thomas Jackson
d2b548a0e7 Add regression test for #17051 2014-10-30 16:43:06 -07:00
Colton Myers
f625c21d77 Merge branch '2014.7' into mergeforward
Conflicts:
	salt/cloud/clouds/ec2.py
	salt/daemons/flo/worker.flo
	salt/master.py
	salt/minion.py
	salt/modules/lxc.py
	salt/states/win_update.py
	salt/states/zk_concurrency.py
2014-10-30 17:42:36 -06:00
Pedro Algarvio
17564057c9 Actually kill the tests sshd process. Provide a custom know_hosts file to use. 2014-10-30 06:45:52 +00:00
Thomas Jackson
52f7216bea Revert naming here too 2014-10-29 14:35:27 -07:00
Thomas Jackson
6612aa808e Revert spelling fix, since its a variable name :) 2014-10-29 13:56:44 -07:00
Mike Place
c1c9245e89 Fixup test failures 2014-10-28 11:29:59 -06:00
Thomas Jackson
aabe6460f6 Misc comment cleanup in tests 2014-10-28 08:12:10 -07:00
Mike Place
e18190bc04 remove sed test 2014-10-27 18:22:18 -06:00
rallytime
933be7c476 Merge branch '2014.7' into develop
Conflicts:
	salt/master.py
	salt/returners/mysql.py
	salt/utils/cloud.py
	salt/utils/minions.py
2014-10-25 08:54:42 -06:00
rallytime
f94cf6ad68 Change profile name for Digital Ocean cloud tests
Digital Ocean changed their image-naming scheme. This should fix the failing tests.
2014-10-24 16:14:02 -06:00
Pedro Algarvio
229eb00e8d Merge branch '2014.7' forward into develop
Conflicts fixed.

Conflicts:
	salt/loader.py
	salt/returners/carbon_return.py
	salt/returners/couchbase_return.py
	salt/returners/couchdb_return.py
	salt/returners/elasticsearch_return.py
	salt/returners/local_cache.py
	salt/returners/memcache_return.py
	salt/returners/mongo_future_return.py
	salt/returners/mongo_return.py
	salt/returners/mysql.py
	salt/returners/odbc.py
	salt/returners/postgres.py
	salt/returners/redis_return.py
	salt/returners/smtp_return.py
	salt/returners/sqlite3_return.py
	salt/states/dockerio.py
	salt/utils/minions.py
2014-10-19 18:21:19 +01:00
Daniel Mizyrycki
e421aff68d Fix lint 2014-10-17 15:39:49 -07:00
Daniel Mizyrycki
54738d0ff5 Added salt-ssh integration test for custom module within SLS 2014-10-17 15:39:49 -07:00
Seth House
c6cb642f36 Added integration tests for the --out-indent flag for JSON output 2014-10-16 20:46:34 -05:00
Thomas S Hatch
1f5da204a9 Fix lint 2014-10-15 16:56:41 -06:00
rallytime
96a1288808 Add minions_denied to netapi test 2014-10-14 16:49:07 -06:00
C. R. Oldham
d07ebe2105 Test for retcode 2014-10-14 13:28:19 -06:00
Thomas S Hatch
5ab6743b85 Merge branch '2014.7' into develop 2014-10-13 20:06:17 -06:00
Thomas S Hatch
4b630d77ed Merge pull request #16407 from s0undt3ch/hotfix/cache-loaded-configs
First attempt at caching the loaded configuration from the filesystem.
2014-10-13 20:05:52 -06:00
Mathieu Le Marec - Pasquet
2d1200b64e pep8 2014-10-13 15:32:11 -06:00
Mathieu Le Marec - Pasquet
acd15e386e display traceback in test error 2014-10-13 15:32:11 -06:00
Mathieu Le Marec - Pasquet
1c4616556a Another fix for outputter reliability 2014-10-13 15:32:10 -06:00
Thomas S Hatch
b2e730a2a6 Merge pull request #16158 from thatch45/pillar_opts_false
Set pillar_opts to default to False
2014-10-13 14:33:44 -06:00
Thomas S Hatch
251a036938 Set the tests to still asume pillar_opts 2014-10-13 08:58:20 -06:00
Mathieu Le Marec - Pasquet
7fe9a5e612 pep8 2014-10-12 12:16:07 +02:00
Mathieu Le Marec - Pasquet
a0aa6eee89 display traceback in test error 2014-10-12 11:37:28 +02:00
Mathieu Le Marec - Pasquet
43fce63b5c Another fix for outputter reliability 2014-10-11 18:37:35 +02:00
rallytime
2c513cf2bb Remove print from tests 2014-10-09 10:33:34 -06:00
Seth House
b0615f9bbf Merge remote-tracking branch 'upstream/2014.7' into develop 2014-10-08 14:40:32 -06:00
Pedro Algarvio
8e93faa072 Fix lint errors 2014-10-08 01:02:11 +01:00
Pedro Algarvio
ab6a54dbf5 The runtime client gets an unfreeze version of the configs 2014-10-08 01:02:10 +01:00
Pedro Algarvio
5e4eb4bbaf Don't add tests in __init__ 2014-10-08 01:02:10 +01:00
Pedro Algarvio
e739561728 Use the salttesting skip helpers 2014-10-08 01:02:10 +01:00
Pedro Algarvio
d569f0811e Let's go wild and cache the local client as reusable a runtime global instance 2014-10-08 01:02:10 +01:00
Pedro Algarvio
3de914e556 Move tests away from __init__ 2014-10-08 01:02:08 +01:00
Pedro Algarvio
dee2c91fde Test the runner client under tests/integration/clients 2014-10-08 01:00:20 +01:00
Pedro Algarvio
d0ca8274ae Remove the unnecessary integration.ClientCase class 2014-10-08 01:00:19 +01:00
Pedro Algarvio
b32d86d0f4 Allow getting the configuration from scratch.
Properly handle `client_config` when loading from cache.
Only delete the `_client` attribute if it has been set.
2014-10-08 01:00:06 +01:00
Pedro Algarvio
93e8b12b93 Try caching the client too 2014-10-08 00:57:22 +01:00
Pedro Algarvio
bbc9120471 The syndic_config call needs the path to the minion config file 2014-10-08 00:57:22 +01:00
Pedro Algarvio
4d047a67f5 Handle more config filenames 2014-10-08 00:57:22 +01:00
Pedro Algarvio
3a3c6b06dd First attempt at caching the loaded configuration from the filesystem.
This basically should avoid loading and parsing YAML over and over again.
2014-10-08 00:57:22 +01:00
Seth House
dd400f2e96 Added integration tests WheelClient cmd_sync cmd_async 2014-10-07 16:43:15 -06:00
Seth House
9bd61a1bd6 Added integration tests for wildcard eauth usernames 2014-10-03 13:28:29 -06:00
Seth House
12b1ba289a Added a wildcard eauth user for testing 2014-10-03 13:28:29 -06:00
Seth House
d0366eaf50 Added unit test for running arguments through the RunnerClient 2014-10-03 13:25:04 -06:00
Seth House
0d07099444 Added integration tests for wildcard eauth usernames 2014-10-02 23:53:37 -06:00
Seth House
a5d861314b Added a wildcard eauth user for testing 2014-10-02 19:21:51 -06:00
Seth House
dbe2fe5c92 Added unit test for running arguments through the RunnerClient 2014-10-02 12:00:01 -06:00
rallytime
8e55094ecd Merge branch '2014.7' into develop
Conflicts:
	salt/modules/influx.py
2014-10-01 10:12:06 -06:00
Thomas S Hatch
1cfd7f7d66 Merge branch '2014.7' into develop
Conflicts:
	salt/netapi/rest_tornado/saltnado.py
2014-09-30 11:40:15 -06:00
Thomas Jackson
d9fdc06742 Ensure that timeout will happen for jobs that don't target any alive minions
Instead of checking if all returns are in, we should check that the job is not running anywhere then enforce the per-minion timeout. I've added a test case for the instance where there is a job fired to a minion that will never return (before it would stall forever)
2014-09-30 10:11:55 -07:00
Thomas Jackson
98af66bbf3 Add a regression test for #16240 2014-09-29 16:37:53 -07:00
Thomas S Hatch
a90fc60a82 Merge branch '2014.7' into develop 2014-09-25 14:23:54 -06:00
Pedro Algarvio
227c62b4ee Merge pull request #16149 from rallytime/improve_loader_test
Fix linode test failures and test all modules
2014-09-25 20:38:06 +01:00
Colton Myers
7f551d48b4 Merge branch '2014.7' into develop 2014-09-25 13:09:19 -06:00
rallytime
210adceeff Actually, just fix pylint 2014-09-25 12:36:00 -06:00
rallytime
e2dce8acba Skip ssh grains test for now. Test environment isn't set up to handle it. 2014-09-25 11:47:44 -06:00
rallytime
ac40a5b2da Fix linode test failures and test all modules 2014-09-25 11:34:50 -06:00
Thomas S Hatch
3198a17193 Merge branch '2014.7' into develop
Conflicts:
	salt/master.py
	salt/minion.py
	salt/modules/hg.py
	salt/utils/process.py
2014-09-25 09:08:14 -06:00
Daniel Mizyrycki
e0c6c8c22a salt-ssh, issue #16129:
Add integration/regression test for issue affecting grains and pillar subsystem.
2014-09-24 20:58:37 -07:00
Thomas S Hatch
3ce955c774 Merge branch '2014.7' into develop
Conflicts:
	salt/cloud/deploy/bootstrap-salt.sh
2014-09-24 12:46:37 -06:00
Thomas S Hatch
43272781f1 Merge pull request #15933 from felskrone/list_denied_minions
List denied minions
2014-09-24 09:34:19 -06:00
vs
af070a56ad its 'Denied Keys', not 'Denied Minions' 2014-09-24 14:10:49 +02:00
Colton Myers
76d5fdb41f Revert "Change timeout for CLI returns" 2014-09-23 16:44:37 -06:00
Thomas S Hatch
8c72baa660 Merge pull request #15942 from jacksontj/develop
Change timeout for CLI returns
2014-09-23 15:40:34 -06:00
Thomas Jackson
c77e2d36ae Pylint fix 2014-09-23 14:37:34 -07:00
rallytime
9fc915e639 Remove 'running' check - it's not reliable 2014-09-23 15:06:08 -06:00
rallytime
1c9e062c78 Fix the ec2 cloud provider tests 2014-09-23 14:55:56 -06:00
Thomas Jackson
ff0081b53d Remove "never timeout" feature 2014-09-23 13:35:11 -07:00
Pedro Algarvio
de520f4766 Revert "Fix broken test on 2014.7" since it runs properly on develop
This reverts commit 9c682933d4.
2014-09-23 19:52:48 +01:00
Colton Myers
3db44821e4 Merge branch '2014.7' into develop
Conflicts:
	salt/config.py
2014-09-23 12:43:47 -06:00
vs
b804056b65 add expected output for denied minions to test_* 2014-09-23 17:36:06 +02:00
Pedro Algarvio
f547aeae41 Merge pull request #16033 from rallytime/fix_2014.7_tests
Fix broken test on 2014.7
2014-09-23 00:09:10 +01:00
rallytime
9c682933d4 Fix broken test on 2014.7 2014-09-22 12:13:10 -06:00
vs
ca5e63ed24 create minions_denied in test-env, update wheel-test to expect minions_denied 2014-09-22 19:44:24 +02:00
Arnold Bechtoldt
3e483523ff changing param back to backend in fileserver to improve useability 2014-09-22 11:16:27 -06:00
Arnold Bechtoldt
94516433e7 fix integration test in fileserver runner, refs #16008 2014-09-22 11:16:27 -06:00
Arnold Bechtoldt
b588245c1d extend fileserver runner with additional features 2014-09-22 11:16:26 -06:00
Arnold Bechtoldt
043c29d518 changing param back to backend in fileserver to improve useability 2014-09-22 08:18:13 +02:00
Arnold Bechtoldt
6b251cbb05 fix integration test in fileserver runner, refs #16008 2014-09-21 21:19:03 +02:00
Arnold Bechtoldt
db5dde72cf extend fileserver runner with additional features 2014-09-21 20:16:41 +02:00
Pedro Algarvio
aed0178072 Correct --output-file-append test 2014-09-19 10:33:38 -06:00
Thomas Jackson
3815bbbfa8 Merge branch 'develop' of github.com:saltstack/salt into develop 2014-09-19 08:11:31 -07:00
rallytime
ffe00e0909 Update ec2 provider and profile config files for cloud nightly tests 2014-09-18 20:41:08 -06:00
rallytime
d861915d93 Add EC2 cloud test file 2014-09-18 20:41:08 -06:00
Thomas Jackson
4abe763591 Add tests for timeouts to client tests. In addition this makes all of the client functions have the same functionality 2014-09-18 14:38:13 -07:00
Thomas Jackson
a7e3586274 Add CLI timeout tests to standard client tests 2014-09-18 14:10:02 -07:00
Pedro Algarvio
8e3f9963cb Correct --output-file-append test 2014-09-17 19:40:58 +01:00
Erik Johnson
111a09f2ad Merge remote-tracking branch 'upstream/2014.7' into develop
Conflicts:
	salt/minion.py
	salt/output/nested.py
2014-09-16 18:46:48 -05:00
Thomas S Hatch
4df1ba300c Merge pull request #15839 from jacksontj/develop
Handle OSErrorin processmanager
2014-09-16 15:05:07 -06:00
Thomas Jackson
29110d0a92 Cleanup, the function name changed 2014-09-16 13:22:55 -07:00
rallytime
064868b87a Fix test failures on develop 2014-09-16 12:23:06 -06:00
rallytime
85f82816c2 Revert "Put provider specific information only in provider configuration file"
This reverts commit 1ccec204b2.
2014-09-16 08:40:43 -06:00
rallytime
a5c658b337 Disable pylint unused import warning 2014-09-16 07:14:38 -06:00
rallytime
1ccec204b2 Put provider specific information only in provider configuration file 2014-09-16 07:08:18 -06:00
rallytime
2801dfbee4 Rename azure tests to match cloud module and add azure sdk import back in 2014-09-16 06:35:12 -06:00
rallytime
35793bd8d9 Pylint fix 2014-09-15 20:20:37 -06:00
rallytime
b30e750a8a Azure cloud tests
Oh, and rename cloud.profiles.d/azure.sls to cloud.profiles.d/azure.conf
2014-09-15 16:58:26 -06:00
rallytime
a30ccd2a7b Add cloud provider and profile configuration files 2014-09-15 15:57:27 -06:00
Colton Myers
e92dc99e9a Merge branch '2014.7' into temp-merge-forward
Conflicts:
	salt/minion.py
2014-09-12 10:37:24 -06:00
Pedro Algarvio
080a06252a Merge pull request #15676 from rallytime/ec2_cloud_tests
Ec2 cloud tests
2014-09-12 08:23:51 +01:00
rallytime
6679f26736 Remove unused kwarg from _check_state_return 2014-09-11 23:32:51 -06:00
Thomas S Hatch
0004ff8898 Merge branch '2014.7' into develop 2014-09-09 11:20:29 -06:00
rallytime
40253cb47b Update ec2 provider and profile config files for cloud nightly tests 2014-09-08 17:06:45 -06:00
rallytime
99cc951377 Add EC2 cloud test file 2014-09-08 16:18:48 -06:00
Thomas S Hatch
0a094e2c43 Merge pull request #15104 from srkunze/feature/safe_env
Made safe environment copy
2014-09-08 14:48:58 -06:00
rallytime
690e85a089 Change expected return for deleting digital ocean instance 2014-09-08 14:13:26 -06:00
Thomas S Hatch
467fd955ed Merge pull request #15564 from s0undt3ch/hotfix/git-describe-first-parent
Use the first parent on git describe when available.
2014-09-06 16:31:46 -06:00
Pedro Algarvio
0a1857b8f1 Update test case to also use --first-parent 2014-09-06 02:32:18 +01:00
rallytime
1727d04701 Generate random cloud provider names on digital ocean 2014-09-05 15:57:00 -06:00
rallytime
6de2a37ec8 Generate random cloud instance name on rackspace tests 2014-09-05 14:09:42 -06:00
rallytime
df504928b6 Update linode tests to use a randomly generated instance name 2014-09-05 09:23:40 -06:00
Sven R. Kunze
d294e95cf5 fixed test_os_environment_remains_intact 2014-09-05 12:20:08 +02:00
Thomas S Hatch
921fd6362c Merge pull request #15512 from ajacoutot/obsd-tests
tests: recognize OpenBSD
2014-09-04 15:27:42 -06:00
Colton Myers
57e187d46f Merge branch '2014.7' into develop
Conflicts:
	salt/modules/mount.py
2014-09-04 13:45:03 -06:00
Antoine Jacoutot
1ef276575f tests: recognize OpenBSD 2014-09-04 10:23:59 +02:00
rallytime
155b548eae Remove unnecessary import requirements to cloud integration tests 2014-09-03 20:12:44 -06:00
Thomas S Hatch
ab1c6bcf27 One more test fix 2014-09-03 08:43:52 -06:00
Thomas S Hatch
b95d575e52 Fix tests for new changes from PR #15217 2014-09-02 17:39:50 -06:00
Colton Myers
704180fd43 Merge branch '2014.7' into develop
Conflicts:
	salt/utils/cloud.py
2014-08-28 12:18:07 -06:00
Thomas S Hatch
55422ccc42 Merge pull request #15303 from whiteinge/fix-wheelclient-auth-tests
Fix failing integration tests for the wheel client
2014-08-27 15:50:25 -06:00
Erik Johnson
ff6a228746 Remove reference to nonexistant function in pkg tests
This fixes a ref that was missed in 7984a8c.
2014-08-27 13:52:36 -05:00
Seth House
a96d58cfba Fix failing integration tests for the wheel client 2014-08-26 19:20:25 -06:00
Kamal Nasser
c613c08869 Replace all occurrences of "Digital Ocean" with "DigitalOcean" 2014-08-25 13:42:01 -06:00
Thomas S Hatch
f0009be6c2 Merge branch '2014.7' into develop 2014-08-21 17:20:26 -06:00
Erik Johnson
ec07a8efea Get effective username using pwd.getpwduid() 2014-08-21 15:22:54 -05:00
Erik Johnson
43de873bb2 D'oh, needed to capitalize USERNAME 2014-08-21 14:35:36 -05:00
Erik Johnson
26a3db2ac8 Set USERNAME env var manually in test suite
This works around a known issue in GitPython when the USERNAME
environment variable is missing.
2014-08-21 12:19:31 -05:00
Erik Johnson
bf982d6893 Update gitfs test opts to reflect new gitfs config opts 2014-08-20 22:23:45 -05:00
Colton Myers
916141fac0 Merge branch '2014.7' into develop
Conflicts:
	tests/integration/shell/call.py
2014-08-20 14:39:31 -06:00
Pedro Algarvio
bf406bf459 Add test case for --output-file-append 2014-08-20 02:42:29 +01:00
Pedro Algarvio
b6e259c21e Add test case for output file permissions
Refs #14979
2014-08-20 02:28:13 +01:00
Pedro Algarvio
ea41586ba4 Merge branch '2014.7' into develop 2014-08-18 05:37:12 +01:00
Thomas S Hatch
02da0dda32 Merge pull request #15016 from whiteinge/netapi-fix-logout
Add tests and a fix for the rest_cherrypy logout view
2014-08-15 23:20:35 -06:00
Colton Myers
932aa97e1f Merge branch '2014.7' into develop 2014-08-15 16:33:02 -06:00
rallytime
b8db5ff56b Change lxc skipIf message to be more helpful 2014-08-15 14:21:09 -06:00
rallytime
396a4de7c5 Make lxc tests run! 2014-08-15 11:09:20 -06:00
Seth House
2b5bed43b9 Add integration test for logging out of the rest_cherrypy app 2014-08-15 09:45:30 -04:00
Pedro Algarvio
9134a69dc1 Merge pull request #14990 from rallytime/gitpillar_tests
Fix gitpillar skipIfs
2014-08-14 18:44:29 +01:00
rallytime
7f170c126f Remove 'RC1' from GIT_VERSION comparison 2014-08-14 11:06:18 -06:00
rallytime
fe5b8d22ec Fix gitpillar skipIfs 2014-08-14 10:34:38 -06:00
Seth House
e2ed04351d Merge remote-tracking branch 'upstream/2014.7' into develop
Conflicts:
	salt/modules/npm.py
2014-08-13 18:56:23 -04:00
Thomas S Hatch
a0d7163abb Merge pull request #14967 from rallytime/pillar_tests
Add skipIfs to pillar tests if GitPillar 0.3.2rc1 or > isn't installed
2014-08-13 16:53:56 -06:00
rallytime
496cfe25b3 Add skipIfs to ext_pillar tests if GitPillar 0.3.2rc1 or > isn't installed 2014-08-13 14:14:53 -06:00
Colton Myers
19cf82fd5f Merge branch '2014.7' into develop
Conflicts:
	doc/topics/transports/raet/index.rst
	salt/minion.py
2014-08-12 14:15:50 -06:00
Seth House
11f4e20bd8 Fix incorrect call to state.single in npm pkgs test 2014-08-11 11:03:00 -04:00
Kamal Nasser
825bb191bf Replace all occurrences of "Digital Ocean" with "DigitalOcean" 2014-08-08 22:16:37 +03:00
Seth House
8a60ce5351 Merge remote-tracking branch 'upstream/2014.7' into develop
Conflicts:
	doc/topics/development/conventions/formulas.rst
2014-08-07 15:51:49 -04:00
Seth House
ed4bb5119e Added pkgs support to the npm module/state 2014-08-07 12:36:39 -04:00
Colton Myers
13995afba0 Merge branch '2014.7' into develop
Conflicts:
	doc/topics/releases/2014.7.0.rst
2014-08-05 15:32:04 -06:00
rallytime
6be33dcdc9 Change install package to help Arch tests pass 2014-08-05 14:35:32 -06:00
Colton Myers
0307fdbe9a Merge branch '2014.7' into develop
Conflicts:
	salt/runners/manage.py
2014-08-01 10:52:52 -06:00
rallytime
f5597010ca Add GPG key file to integration tests 2014-07-31 10:57:49 -06:00
Thomas S Hatch
aeda9730ca Merge pull request #14460 from steverweber/fix_restarts
fix issues with keepalive minion
2014-07-25 21:46:01 -06:00
Seth House
c046f1cac7 Revert "Switch NetapiClient to use client_config instead of master_config"
This partially reverts commit 2bc1ed8afb.
2014-07-25 14:42:19 -06:00
steverweber
bf8f936fa4 fix issues with keepalive minion 2014-07-25 15:13:05 -04:00
C. R. Oldham
253de7a995 PyLint fix. 2014-07-25 12:48:07 -06:00
C. R. Oldham
f53e477735 Merge commit, resolve conflict 2014-07-25 11:16:22 -06:00
C. R. Oldham
c94808689d Extend dot-in-pkg test to RHEL 5 as well 2014-07-25 10:57:18 -06:00
Thomas S Hatch
288e9bba29 TABS?!?!? Really @cro ?? 2014-07-25 10:39:19 -06:00
Thomas S Hatch
35c3614f7f Merge branch 'rhel7_pkgtests' of https://github.com/cro/salt into cro-rhel7_pkgtests 2014-07-25 10:38:10 -06:00
C. R. Oldham
1891b07856 Make this test check for diff packages on RHEL/Centos 6 vs 7 2014-07-24 19:11:56 -04:00
C. R. Oldham
b6f70ac80f Make this test check for diff packages on RHEL/Centos 6 vs 7 2014-07-24 19:09:52 -04:00
Seth House
2bc1ed8afb Switch NetapiClient to use client_config instead of master_config
We access the Salt master through client interfaces and should use the
correct config when doing so. We should also reuse the already-loaded
opts when instantiating LocalClient().
2014-07-24 16:08:31 -06:00
Seth House
33043ef919 Added NetapiClient integration tests 2014-07-24 16:08:31 -06:00
Seth House
bd72c35f7c Add tests for the cmd_sync and cmd_async RunnerClient methods 2014-07-24 16:08:30 -06:00
Seth House
c34cddcfbb Move eauth_creds to class-level for reuse 2014-07-24 16:08:30 -06:00
Seth House
b077b2436e Add 'auto' eauth backend for tests 2014-07-24 16:08:30 -06:00
C. R. Oldham
9dc3f696ca Fix two RHEL7 tests 2014-07-24 14:11:03 -07:00
rallytime
7bb5ef3773 Skip lxc tests if no lxc and skip failing vt_test if running osx 2014-07-21 17:11:20 -06:00
rallytime
73b185cb72 Allow OSX to run tests with change to TMPDIR 2014-07-21 14:26:59 -06:00
Thomas S Hatch
ef277feba1 Merge pull request #14314 from cachedout/grains_raet
Increase timeout for grains test
2014-07-17 15:51:37 -06:00
Mike Place
919e9db946 Increase timeout for grains test 2014-07-17 13:27:08 -06:00
Aditya Kulkarni
88a873a171 Ensure tests pass on raet and zmq 2014-07-17 10:32:07 -04:00
Aditya Kulkarni
615e0b7550 Add timeouts to wait longer 2014-07-15 16:50:32 -04:00
Aditya Kulkarni
978ae5fb51 Make sure test_grain passes with raet 2014-07-15 16:27:47 -04:00
Thomas S Hatch
25a4df3566 Merge pull request #14238 from rallytime/fix_spelling
Fix spelling error: doctring -> docstring
2014-07-15 10:41:16 -06:00
Thomas S Hatch
4e91eee9ca Merge pull request #14228 from terminalmage/issue13873
Fix regression in templating local files
2014-07-15 10:38:45 -06:00
rallytime
486aa982ad Fix spelling error: doctring -> docstring 2014-07-15 09:26:55 -06:00
David Boucha
8bddefc53b Merge pull request #14229 from whiteinge/rest_cherrypy-run-sessions
Add rest_cherrypy tests for the /run entrypoint; fix session reference when sessions are disabled
2014-07-15 02:12:15 -06:00
Seth House
63be4efae9 Added basic smoke-tests for the rest_cherrypy /run entrypoint 2014-07-14 22:11:20 -06:00
Erik Johnson
2939eaec15 Clean up filehandle usage in file state tests
This does a few things:

1. Change calls to open() to use salt.utils.fopen()

2. Use with blocks where applicable
2014-07-14 21:23:06 -05:00
Erik Johnson
f847bae5a2 Add tests for templating local files 2014-07-14 21:23:06 -05:00
Seth House
2dad062f8a Move rest_cherrypy mocked methods into individual tests 2014-07-14 20:18:21 -06:00
Pedro Algarvio
698784d1e7 White-space lint fix 2014-07-15 01:43:52 +01:00
Thomas S Hatch
09f5ad951b Merge pull request #14210 from pass-by-value/raet_key_test_refactor
Refactor salt key tests to be raet compatible
2014-07-14 16:07:43 -06:00
Aditya Kulkarni
91943766d3 Refactor salt key tests to be raet compatible 2014-07-14 15:22:38 -04:00
Mike Place
a08849c270 Remove old-style env= tests. 2014-07-14 11:03:03 -06:00
Thomas S Hatch
7e54d0fa20 Revert "lxc refactor" 2014-07-12 11:38:03 -06:00
Thomas S Hatch
1e5a545c8c Merge pull request #14137 from mgwilliams/lxc
lxc refactor
2014-07-11 16:00:06 -06:00
Thomas S Hatch
da2f3543fd Skip gitfs tests
These are running in an incosistent way, all of our local tests pass
2014-07-11 15:17:58 -06:00
Matthew Williams
71e1522c08 WIP: continue restructure of modules.lxc 2014-07-11 19:17:55 +00:00
Matthew Williams
3a0263d551 WIP: lxc restructure 2014-07-11 18:28:37 +00:00
Thomas S Hatch
2ca17d451a me english so fail 2014-07-10 16:11:00 -06:00
Thomas S Hatch
e5fe94227f Merge pull request #14097 from mgwilliams/lxc
add lxc integration tests
2014-07-10 13:31:17 -06:00
Matthew Williams
e102a95b84 use a faster template (sshd) for lxc integration tests 2014-07-10 14:38:28 -04:00
Matthew Williams
298d4e6eac add lxc integration tests 2014-07-10 13:37:48 -04:00
Thomas S Hatch
af5f42a370 Merge pull request #14069 from rallytime/batch_test
Simple integration test for batch cli command
2014-07-10 10:06:19 -06:00
rallytime
0000859eb1 pylint fix 2014-07-09 22:31:54 -06:00
rallytime
1acf3ac3a9 Fix batch test 2014-07-09 22:00:41 -06:00
Pedro Algarvio
29fae98470 Merge pull request #14072 from terminalmage/refine-gitfs-tests
Refine gitfs tests
2014-07-10 00:02:28 +01:00
rallytime
1df0c20d97 Pyling fixes 2014-07-09 16:22:00 -06:00
Erik Johnson
1fd16fa434 Refine gitfs tests
This adds a tearDown to ensure a clean copy of the repo for each test.
In addition, it removes the dependency on lexicographical order by
running a find_file() inside the two tests which require it in order to
ensure that the file exists in the gitfs cache.
2014-07-09 16:06:36 -06:00
rallytime
56279770a9 Simple integration test to execute a batch command to help catch regressions 2014-07-09 15:41:18 -06:00
Thomas S Hatch
a852b87ff9 Merge pull request #14054 from pass-by-value/raet_test_full_returns_test
Make sure test_full_returns passes for RAET
2014-07-09 11:18:21 -06:00
Aditya Kulkarni
b9571b61c7 Make sure test_full_returns passes for RAET 2014-07-09 09:32:50 -06:00
Thomas S Hatch
37a14bf37c Merge pull request #14039 from terminalmage/fix-gitfs-tests
Fix gitfs tests
2014-07-08 20:05:01 -06:00
Erik Johnson
d942c98ef6 Fix gitfs tests
This changes how the setUp function initializes and commits the repo
used as a gitfs remote by these tests. Instead of using the git.Git
class, it simply uses the index object to add and then commit. See here
for more info:

https://pythonhosted.org/GitPython/0.3.1/tutorial.html#the-index-object

Additionally, file_hash() and serve_file() are designed to check copies
of files that have been retrieved from the blobs, in
$cachedir/gitfs/refs/$saltenv/path/to/file. The paths have been fixed in
these two tests, and the sha1 test has been renamed to ensure that it is
executed after test_find_file, so that the file exists in the cache.
2014-07-08 18:56:12 -06:00
Aditya Kulkarni
edfabad5e2 Skip tests if no internet connection 2014-07-08 17:16:47 -06:00
Thomas S Hatch
b7a6200708 Merge pull request #14027 from pass-by-value/ext_pillar_12647
Make sure multiple git pillar sources work
2014-07-08 13:41:38 -06:00
Thomas S Hatch
f0724b3b41 Use salt.utils.process.clean_proc instead of the one in master.py
We need to clean up the master.py clean_proc so we only use one
2014-07-08 12:18:24 -06:00
Aditya Kulkarni
a7b52855d3 Make sure multiple git pillar sources work 2014-07-08 10:58:31 -06:00
Thomas S Hatch
09366515dc Merge pull request #14016 from rallytime/fix_bad_copypaste
Fix typo in email from bad copy-paste
2014-07-07 16:16:47 -06:00
rallytime
d5c2a92d24 Fix typo in email from bad copy-paste 2014-07-07 16:12:11 -06:00
Thomas S Hatch
c1d151067d verify the raet cacedir in tests 2014-07-07 15:56:16 -06:00
Pedro Algarvio
ed7d14e237 White-space lint fix 2014-07-05 00:45:53 +01:00
Pedro Algarvio
1ffb0e8a51 White-space related fixes 2014-07-04 00:56:49 +01:00
Pedro Algarvio
4acda7ab14 Move imports 2014-07-04 00:56:48 +01:00
Thomas S Hatch
07f55489b8 Merge pull request #13942 from cachedout/call_test_fix
Fix broken test.
2014-07-02 17:10:16 -06:00
Mike Place
51e3089a7c Fix broken test. 2014-07-02 14:40:08 -06:00
Nitin Madhok
900021a820 Fixing lint in tests/integration/shell/auth.py 2014-07-02 16:11:49 -04:00
Thomas S Hatch
a985508513 Merge pull request #13902 from cachedout/auth_test_fixing
Fix failing auth test
2014-07-02 10:17:16 -06:00
Mike Place
a8c422da07 Just run useradd/userdel once 2014-07-01 17:04:16 -06:00
Thomas S Hatch
0dee0d82e9 Merge pull request #13901 from cachedout/fix_arg_test
Fix broken arg test
2014-07-01 16:57:46 -06:00
Mike Place
6e31fb42a0 Decorate teardown just to be sure 2014-07-01 16:40:32 -06:00
Mike Place
be07ccbd7c Fix failing auth test 2014-07-01 16:38:30 -06:00
Mike Place
504378668c Fix broken arg test 2014-07-01 16:07:59 -06:00
Mike Place
c3d0b5cba5 Dummy file to fix failing tests. 2014-07-01 15:58:01 -06:00
Mike Place
f9478a70f7 Fix all RAET publish tests 2014-07-01 15:13:52 -06:00
Thomas S Hatch
1b4736d5df lint 2014-06-30 18:01:38 -06:00
Thomas S Hatch
50ee9dd5af Merge pull request #13680 from pass-by-value/file_perms_no_exit
File perms no exit
2014-06-30 17:43:54 -06:00
Pedro Algarvio
db58cbd8ca Ignore import 2014-06-30 01:03:36 +01:00
Colton Myers
0c4b66aa8a Merge pull request #13806 from whiteinge/rest_cherrypy-401-fix
Raise a 401 reponse instead of redirecting to the login page
2014-06-27 15:14:17 -06:00
Seth House
f18a636628 Raise a 401 reponse instead of redirecting to the login page
Also fixed bad tests that should have caught this.

Fixes saltstack/salt-api#155.
2014-06-27 14:03:34 -06:00
Thomas S Hatch
a56bed4d03 Don't force import of salt.master in integration tests 2014-06-27 13:13:41 -06:00
Thomas S Hatch
13099a458e Fix test where the arg passing should run through
parse input first
2014-06-26 21:48:59 -06:00
Aditya Kulkarni
b991977e69 Update expected message 2014-06-26 12:58:49 -04:00
Aditya Kulkarni
54110a9658 Fix paths 2014-06-26 10:18:58 -04:00
Nitin Madhok
6773a34c1f Fixing pylint violations 2014-06-25 19:27:16 -04:00
Aditya Kulkarni
55c92b4eeb Move master top file before test 2014-06-25 16:50:17 -04:00
Aditya Kulkarni
3a59cbf9cb Add regression test for master_tops 2014-06-25 14:53:11 -04:00
rallytime
c001f717a4 Fix digital ocean provider integration tests 2014-06-24 14:33:15 -06:00
Aditya Kulkarni
8ee2e01092 Change from auto to pam 2014-06-24 14:17:54 -04:00
Aditya Kulkarni
79c55a4784 Make sure tests pass on the right setup 2014-06-24 14:13:30 -04:00