valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
44,132 Commits 24 Branches 182 Tags 341 MiB
f40affd5d9
Commit Graph

3512 Commits

Author SHA1 Message Date
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
b8b4158377 Remove unused import 2014-11-26 21:52:30 +00:00
Pedro Algarvio
aaf0f4aba0 Fix imports 2014-11-26 21:08:13 +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
bd7f23ac6f Switch open() for salt.utils.fopen() 2014-11-26 20:30:13 +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
9f60901597 Switch open() for salt.utils.fopen() 2014-11-26 18:29:21 +00:00
Pedro Algarvio
737bd84402 Switch open() for salt.utils.fopen() 2014-11-26 18:28:56 +00:00
Pedro Algarvio
53f554468d Switch open() for salt.utils.fopen() 2014-11-26 18:28:15 +00:00
Pedro Algarvio
91af550062 Switch open() for salt.utils.fopen() 2014-11-26 18:25:20 +00:00
Pedro Algarvio
c4d0686024 Switch open() for salt.utils.fopen() 2014-11-26 18:24:08 +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
1daa9a4d69 Fix failing test in develop 
Add progress
 2014-11-25 10:31:27 -07:00
Thomas S Hatch
93ddc68b9a Merge pull request #18454 from rallytime/cmd_unittests 
Started some unit tests for the cmdmod.py module
 2014-11-25 09:35:40 -07:00
Thomas S Hatch
b83ab14c01 Merge branch '2014.7' into develop 
Conflicts:
	salt/states/file.py
 2014-11-25 09:29:58 -07:00
Mike Place
4451833a6b Merge pull request #18292 from cachedout/fix_runners 
If we want returns, maybe we shouldn't exit first
 2014-11-25 09:12:41 -07:00
starzyk1
d6b5b58280 Fixes of pylint violations 2014-11-25 14:22:30 +01:00
starzyk1
4bdede0700 Fixes of pylint violations 2014-11-25 12:49:14 +01:00
Konrad Starzyk
0759323c99 Merge remote-tracking branch 'upstream/develop' into jboss7 2014-11-25 11:52:27 +01:00
starzyk1
50fab573c8 Fixes of pylint violations 2014-11-25 11:51:43 +01:00
Mike Place
d746bb272c Run runner tests async 2014-11-24 20:48:04 -07:00
rallytime
dc3c8f91bd Pylint fix 2014-11-24 19:44:54 -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
rallytime
792433f915 Started some unit tests for the cmdmod.py module 2014-11-24 17:03:52 -07:00
rallytime
022d2dbbfb Remove unused import 2014-11-24 13:02:08 -07:00
rallytime
512f07303a Put the parser variable in the correct place 2014-11-24 12:13:38 -07:00
rallytime
d2e5443860 Add parser to jenkins.py 2014-11-24 11:58:24 -07:00
Pedro Algarvio
0b946ba32b Merge branch '2014.7' into hotfix/merge-forward 2014-11-22 02:17:10 +00:00
Pedro Algarvio
6e0f4da593 Fix syntax errors 2014-11-22 02:16:26 +00:00
Pedro Algarvio
50bb9c3867 Merge branch '2014.7' into hotfix/merge-forward 
Conflicts:
	salt/fileclient.py
 2014-11-21 23:39:28 +00:00
Pedro Algarvio
74e23b9e26 And also the base branch of the incoming PR's branch 2014-11-21 23:35:37 +00:00
Pedro Algarvio
672e98cf0f Use requests instead of github package. Also output the PR incoming branch. 2014-11-21 23:33:29 +00:00
Konrad Starzyk
6656837ff0 Merge remote-tracking branch 'upstream/develop' into jboss7 2014-11-21 21:52:46 +01: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
44f91a1d21 Add regression test for #8670 
Before the fix in #18363 get_event would return None on the first non-matching event (since wait was 0), this is to verify that get_event works properly with a wait of 0
 2014-11-21 08:54:05 -08:00
Thomas Jackson
75bf7bd091 pylint fix 2014-11-20 18:35:41 -08: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
7b4601219b More import errors disables 2014-11-20 18:57:09 +00:00
Pedro Algarvio
0c50d789b7 The imports actually work so shut up PyLint! 2014-11-20 18:22:19 +00:00
Pedro Algarvio
21da23c070 Fix the class name 2014-11-20 17:35:42 +00:00
Pedro Algarvio
eb4bfbbde4 Remove slash 2014-11-20 17:19:58 +00:00
Pedro Algarvio
61de0bd629 Let's see if the slash makes a difference 2014-11-20 17:18:12 +00:00
Pedro Algarvio
5a3fead6de Allow the tests to be properly skipped 2014-11-20 17:16:09 +00:00
Pedro Algarvio
10a9c479ff Remove unused import 2014-11-20 16:45:36 +00:00
Pedro Algarvio
d651788dff Allow the test cases to be properly skipped 2014-11-20 16:40:48 +00:00
Pedro Algarvio
76eb73b71e Fix import 2014-11-20 16:40:48 +00:00
Pedro Algarvio
8ecd85edcc Mock the right object 2014-11-20 16:40:48 +00:00
Pedro Algarvio
175cba7ff5 Fix imports 2014-11-20 16:40:47 +00:00
Pedro Algarvio
5cf320f45f Allow the tests to be skipped 2014-11-20 16:40:47 +00:00
Pedro Algarvio
f37495c74f Allow the test case to properly skip on missing tornado package 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
0e4f8de204 Use urlopen from six 2014-11-20 16:40:46 +00:00
Pedro Algarvio
13df58d2e6 Use urlopen and URLError from six 2014-11-20 16:40:45 +00:00
Pedro Algarvio
2bc6b735ef Use urlencode from six 2014-11-20 16:40:45 +00:00
Pedro Algarvio
0937d2b4e1 Use urlencode from six 2014-11-20 16:40:45 +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
Pedro Algarvio
66ea3afab8 Merge pull request #18326 from rallytime/pylinting 
Fix missing cls variable and add some docstring info
 2014-11-20 16:35:04 +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
Konrad Starzyk
99406c2215 Merge remote-tracking branch 'upstream/develop' into jboss7 2014-11-20 11:20:41 +01:00
starzyk1
8101b2a8e7 Documentation fixes for jboss7 and artifactory states/modules 2014-11-20 11:16:57 +01:00
Sławek Ehlert
03f464c773 remove the leftovers from the previous file 2014-11-20 00:29:12 +01:00
Sławek Ehlert
e2e4bcf2ae fix output of subsequent calls for `environ.setenv` state 
Previously ``setenv`` function (from ``modules.environ``) was
called even if the environment was already in a proper state.
This caused ``highstate`` to always report changes to be applied
even if they were not required.
 2014-11-19 23:56:09 +01:00
Mike Place
6b0e9c4e29 Provide nbopen poller default and increase interval in jenkins 2014-11-19 12:30:00 -07: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
Colton Myers
9a89057f83 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/transport/__init__.py
 2014-11-13 12:40:24 -07: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
ebfee14fda Add test for using a Future in multiple "Any" futures 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
Thomas Jackson
26afdd34ae Re-factor test cases 2014-11-13 08:36:27 -08:00
Thomas Jackson
4b8ac6a9e3 Add tests for auth handler 
break unit tests for handlers into a separate file
Misc error handling fixes in Login handler
 2014-11-13 08:36:26 -08:00
Thomas Jackson
6245c27391 Add tests for deserialize (and fix a few bugs in there) 
More cleanup of websockets separation
 2014-11-13 08:36:26 -08:00
Thomas Jackson
ecbd269eda Move future testing out of event listener test class 2014-11-13 08:36:26 -08:00
Thomas Jackson
ecefbb91dc Add tests for Any Futures 
move eventlistener callbacks into the class
 2014-11-13 08:36:26 -08:00
Thomas Jackson
3816236e26 Add test for event you don't want 2014-11-13 08:36:26 -08:00
Thomas Jackson
257a73fb69 Add first tests for rest_tornado! 2014-11-13 08:36:26 -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
Thomas S Hatch
03e2785281 lint 2014-11-11 10:03:22 -07:00
Thomas S Hatch
0ea13995de lint 2014-11-11 10:01:33 -07:00
Thomas S Hatch
840abd247a Merge pull request #17283 from cachedout/event_runners 
Evented runners
 2014-11-10 19:58:50 -07:00
Thomas S Hatch
142efd56b0 Merge pull request #17574 from bechtoldt/tame_ipv6_regex_beat 
Fix broken ipv6 address verification in salt.utils.validate.net
 2014-11-10 18:57:57 -07:00
Arnold Bechtoldt
485796e9f9 use the right function to test 2014-11-11 02:14:58 +01:00
Arnold Bechtoldt
d03ff7d6dd fix broken ipv6 address verification in salt.utils.validate.net 2014-11-11 01:42:46 +01:00
C. R. Oldham
8b8ab335cc Merge pull request #17317 from cro/pg_role_quote_tests 
Update tests to respect changes in pg module.  Test failures are not related.
 2014-11-10 16:51:43 -07:00
Mike Place
da163471af Fix up tests 2014-11-10 15:42:45 -07:00
C. R. Oldham
0303154c31 Update tests to respect changes in postgres module 2014-11-10 14:37:44 -07:00
Thomas Jackson
f24c94dd7b Pylint fixes 2014-11-10 13:03:35 -08:00
Thomas S Hatch
7300d3ac6a Merge pull request #17291 from ashb/gem_bin 
Allow specifying custom `gem` to use in gem state and module
 2014-11-10 09:37:29 -07:00
Thomas S Hatch
8862c2e829 Merge pull request #17290 from plastikos/improvement-yaml_encode 
Add yaml_encode() jinja filter
 2014-11-10 09:35:39 -07:00
Thomas Jackson
c43ac0a4c2 remove comment from local debugging 2014-11-10 08:33:39 -08:00
Thomas Jackson
e862642ff7 Add tests for SREQ class 
revert keys() change to socket dicts since we will mutate the dict on iteration
 2014-11-10 08:29:58 -08:00
Pedro Algarvio
1071ec0859 Merge branch '2014.7' into develop 2014-11-09 14:19:33 +00:00
Pedro Algarvio
ed321a4898 Don't reset the template registry 2014-11-09 14:17:15 +00:00
Ash Berlin
b1e57b82ea Allow specifying custom gem to use in gem state and module 
Better late than never - here is a PR for issue #13202
 2014-11-09 01:06:08 +00:00
Pedro Algarvio
d8315ebd32 Merge branch '2014.7' into develop 2014-11-08 09:39:55 +00:00
Justin Findlay
ba1ce3dfc5 pylint fixes 2014-11-08 00:33:02 -07:00
Thayne Harbaugh
e4488a3956 Add yaml_encode() jinja filter 
* Add documentation for yaml_encode()
  * Mention yaml_encode() in formulas documentation
  * Add unit tests for yaml_encode()
  * Improve unit tests and documentation for related yaml_dquote()
 2014-11-07 19:12:58 -07:00
Justin Findlay
9e9903c521 add unit tests for salt/modules/cp.py 2014-11-07 16:35:25 -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
Thomas S Hatch
656817141c Merge pull request #17210 from hulu/typos-galore 
fix numerous typos+misspellings
 2014-11-06 14:25:53 -07:00
Thomas S Hatch
5e490cb263 Merge pull request #17209 from cachedout/eventlist_chmod 
+x for eventlisten and minionswarm
 2014-11-06 14:24:41 -07:00
Thomas S Hatch
e4be523ee4 Merge pull request #17234 from thatch45/bemehow-get_vpc_id 
Merge #17181
 2014-11-06 14:06:56 -07: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
Joseph Hall
e1487b330b Merge pull request #17222 from hulu/typos-2-electric-boogaloo 
more typo/misspelling fixes
 2014-11-06 11:41:07 -07:00
Thomas S Hatch
1e74ae2c5f lint fixes 2014-11-06 11:05:37 -07:00
Thomas S Hatch
4e49453952 Merge branch 'get_vpc_id' of https://github.com/bemehow/salt into bemehow-get_vpc_id 2014-11-06 11:03:55 -07:00
Chris Rebert
802a631dd9 more typo/misspelling fixes 2014-11-05 15:29:25 -08: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
Chris Rebert
b9bb56841d fix numerous typos+misspellings 2014-11-05 13:57:47 -08:00
Mike Place
951a434228 +x for eventlisten and minionswarm 2014-11-05 14:49:32 -07:00
Chris Rebert
c46e43f296 tests/unit/utils/event_test.py: fix typo in comment 2014-11-05 11:03:54 -08:00
Michal Bicz
73f9654018 add module to find vpc id based on cidr, name or tags 2014-11-04 23:38:06 -08:00
Thomas S Hatch
77966c56c1 ilint 2014-11-04 15:18:37 -07:00
Thomas S Hatch
8fcab999dd Merge branch 'vpc_describe' of https://github.com/bemehow/salt into bemehow-vpc_describe 2014-11-04 15:15:51 -07: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
Thomas S Hatch
608d053844 Merge pull request #17121 from plastikos/improvement-yaml_quote 
Add yaml_dquote() and yaml_squote() utilites; load them as Jinja filters...
 2014-11-04 14:02:05 -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
Thomas S Hatch
ff593e30b2 remove duplicate code 2014-11-04 10:05:24 -07:00
Roman Inflianskas
202d3c343a modules.linux_acl: add recursive option for all functions 2014-11-04 19:54:41 +03:00
Thomas S Hatch
8e8b4c6b5c lint 2014-11-04 09:48:58 -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
Roman Inflianskas
403a8b4cc9 modules.linux_acl: cleanup comments 2014-11-04 14:45:23 +03:00
Roman Inflianskas
b6cbb70e38 modules.linux_acl: add unit tests 2014-11-04 14:45:17 +03:00
Roman Inflianskas
8f409a4180 modules.linux_acl: add unit tests 2014-11-04 14:45:06 +03:00
Roman Inflianskas
16b4e2619f modules.linux_acl: raise exception on no files given; add unit tests 2014-11-04 14:44:44 +03:00
Konrad Starzyk
5b43246ab9 JBoss7 and Artifactory state/modules 2014-11-04 11:16:30 +01:00
Michal Bicz
6c2f21263c added unit tests, used vpc_ids argument instead of filter to find VPC, lint 2014-11-03 23:25:04 -08:00
Thayne Harbaugh
dc4892442a Add yaml_dquote() and yaml_squote() utilites; load them as Jinja filters. 
When templating state files the variable contents may contain
characters that YAML will interpret specially.  Rather than try to
escape the special characters so that they are safe use a filter that
protects special characters in YAML values.
 2014-11-03 16:14:54 -07: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
Roman Inflianskas
f5903dfe6d modules.parted: tests: fixed probe deprecation testing #2 2014-11-03 13:12:46 +03:00
Roman Inflianskas
d04abdf91a modules.parted: tests: fixed probe deprecation testing 2014-11-03 12:30:13 +03:00
Roman Inflianskas
70e4062cf9 Actually testing parted 
called_once_with didn't work, changed to assert_called_once_with
 2014-11-03 11:52:01 +03:00
Colton Myers
0cc0d64136 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/hg.py
 2014-10-31 16:14:34 -06:00
Thomas S Hatch
15a51935fa Merge pull request #17073 from jfindlay/jmoney/linux_sysctl_test 
Jmoney/linux_sysctl_test
 2014-10-31 15:25:35 -06:00
Justin Findlay
26094b39b4 pylint fix on linux_sysctl_test.py 2014-10-31 12:41:04 -06:00
Justin Findlay
f09b8e3873 remove redundant mock_open() in darwin_sysctl_test.py 2014-10-31 10:42:57 -06:00
Justin Findlay
106f645c9e adding tests for modules/linux_sysctl.py 2014-10-31 10:16:41 -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
Thomas S Hatch
3f58d716a2 Merge pull request #16878 from plastikos/improvement-filter_by 
Improve filter_by() base argument:
 2014-10-30 10:02:32 -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
Pedro Algarvio
136803bb9d Merge pull request #16941 from cachedout/remove_deprecations 
Remove deprecations
 2014-10-28 18:49:12 +00: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
Seth House
0d6e33a419 Merge remote-tracking branch 'upstream/2014.7' into develop 2014-10-28 08:47:18 -05:00
Mike Place
39d6d8e75f remove splitted test 2014-10-27 18:23:20 -06:00
Mike Place
e18190bc04 remove sed test 2014-10-27 18:22:18 -06:00
Mike Place
8dc8ee51be Merge pull request #16942 from rallytime/module_state_tests 
Added unit tests for module state
 2014-10-27 18:13:11 -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
rallytime
19d70dfac5 Added another test to module.run state unit tests 2014-10-24 15:28:03 -06:00
Thayne Harbaugh
7bd7e4c2b7 Appease the pylint gods; back-out unrelated changes. 2014-10-24 11:32:12 -06:00
Thayne Harbaugh
65e477dd67 Improve filter_by() base argument: 
* Change filter_by() base argument to a key in lookup_dict rather
    than a dictionary.  This allows more compact usage and more
    readable use of base values/defaults in the lookup_dict.

  * Change/improve function-local documentation for lookup_dict().

  * Add specific use-case of "base" argument for lookup_dict() in the
    formulas documentation.

  * Expand filter_by() unit testing to validate use of base argument.

  * Add unit test for salt.utils.dictupdate.update() to provide
    complete depth-of-testing of filter_by() which uses
    dictupdate.update().
 2014-10-24 11:13:47 -06:00
rallytime
f6490e9572 Add initial unit tests for module.run state function 2014-10-24 08:56:40 -06:00
Thomas S Hatch
08db71c0b9 Merge pull request #16849 from makinacorpus/f4 
Support for vt in pip & venv modules
 2014-10-23 15:13:48 -06:00
Thomas S Hatch
743586e53b Merge pull request #16837 from felskrone/cachecli_only_with_concache 
if con_cache is inactive, dont create con_cache-client
 2014-10-23 14:06:40 -06:00
Mathieu Le Marec - Pasquet
2b4d7e3080 Support for vt in pip & venv modules 2014-10-23 20:18:44 +02:00
Thomas S Hatch
b06b21c8a9 Merge pull request #16785 from bahadir/add-batch-timeout 
Don't use hardcoded timeout value in batch mode.
 2014-10-23 11:59:29 -06:00
vs
b814c09cab provide con_cache in the opts 2014-10-23 19:08:08 +02:00
rallytime
df827ab13c Merge branch '2014.7' into develop 
Conflicts:
	salt/utils/minions.py
 2014-10-21 16:07:33 -06:00
Nicole Thomas
ff1646e451 Merge pull request #16769 from rallytime/jid_str_test 
Test long jid passed on CLI
 2014-10-21 15:50:29 -06:00
Cimarron Mittelsteadt
43fea4f3ea TST: Updated mac_user tests for modifications to OS release handling 2014-10-21 15:00:58 -06:00
Bahadır Kandemir
713e168fc2 Add option to mock test. 2014-10-21 18:08:21 +03:00
rallytime
ed37dde094 Pylint fix 2014-10-20 21:21:01 -06:00
rallytime
3020b2084b Test long jid passed on CLI 2014-10-20 16:53:56 -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
Cimarron Mittelsteadt
d6abb6c77d TST: Updated mac_user tests for modifications to OS release handling 2014-10-17 09:28:56 -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
1468c26ec1 Merge branch '2014.7' into develop 
Conflicts:
	doc/faq.rst
	doc/ref/configuration/minion.rst
	salt/minion.py
	salt/states/pkg.py
	salt/transport/__init__.py
 2014-10-13 15:03:33 -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
ef83ad23c3 Merge pull request #16579 from s0undt3ch/hotfix/vt-fixes 
More VT fixes
 2014-10-13 14:23:11 -06:00
Pedro Algarvio
e683619f9f Having data left to read does not mean the process is alive 2014-10-13 17:19:42 +01: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
Pedro Algarvio
4470c0dc68 White-space lint fix 2014-10-12 04:29:59 +01:00
Pedro Algarvio
51479e4592 Include a test case in order to check for full output from VT 2014-10-12 03:37:08 +01:00
Pedro Algarvio
743c26e562 Instead of checking for a live process, check for unread data. 
Add a unit test which tests proper behaviour.

Fixes #15941
 2014-10-12 02:28:35 +01:00
Pedro Algarvio
41870ef3e0 Fix ensure in syspath call 2014-10-12 02:16:23 +01:00
Pedro Algarvio
4fca1c96da Set the cachedir to a relative path 2014-10-12 02:16:23 +01:00