valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
45,400 Commits 24 Branches 182 Tags 341 MiB
be9cac8fd1
Commit Graph

3777 Commits

Author SHA1 Message Date
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
3edd84a244 Merge pull request #19783 from jayeshka/deb_apache-unit-test 
adding deb_apache unit test
 2015-01-16 17:02:07 -07: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
Thomas S Hatch
d95ec638ef Merge pull request #19808 from jfindlay/mount_unit_tests 
Mount unit tests
 2015-01-16 16:57:12 -07:00
Justin Findlay
bcdab12b75 fix mount module unit tests 
I currently don't have access to an OpenBSD system, so I don't know what
the 6 columns of output of `swapctl -kl` is since some of the outputted
columns are discarded by the mount module, but as they are discarded,
they do not affect the tests of mount.swaps.
 2015-01-16 15:40:39 -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
effc9488f5 Merge branch 'develop' of github.com:saltstack/salt into add-boto-sns-module 2015-01-16 10:02:52 -08:00
Jayesh Kariya
bb6e22999e Adding defaults unit test case 2015-01-16 19:12:19 +05:30
Jayesh Kariya
f245aec8a9 resolved pylint error 2015-01-16 17:39:32 +05:30
Jayesh Kariya
ede0a375df adding deb_apache unit test 2015-01-16 15:00:52 +05:30
Nicole Thomas
0b3c3f84c8 Merge pull request #19780 from rupeshta/event_unit_tests 
test event tests
 2015-01-16 00:23:44 -07:00
Rupesh Tare
74015f974e test event tests 2015-01-16 11:38:29 +05:30
Rupesh Tare
64b29032af test gnomedesktop tests 2015-01-16 11:20:17 +05:30
Mike Place
bb3c1714f8 Style fixes 2015-01-15 10:48:44 -07:00
Mike Place
6d14d4e661 Fix broken test 2015-01-15 10:41:08 -07:00
Mike Place
0399fc32c2 Fix broken test 2015-01-15 10:06:28 -07:00
Nicole Thomas
f526f61041 Merge pull request #19684 from jayeshka/chef-unittest 
adding chef unit test case
 2015-01-15 07:57:20 -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
Thomas S Hatch
3a89e67488 Merge pull request #19735 from lyft/add-aws-account-id-function 
Add get_account_id function boto_iam
 2015-01-14 16:20:36 -07: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
Thomas S Hatch
7041530111 Merge pull request #19725 from rupeshta/firewalld_unit_tests 
test firewalld tests
 2015-01-14 12:18:59 -07:00
Thomas S Hatch
bc639a9f75 Merge pull request #19723 from jayeshka/data_unit_tests 
Added unit test for data
 2015-01-14 12:18:31 -07:00
Thomas S Hatch
7d5d095bae Merge pull request #19719 from terminalmage/archive-fixes 
Fix archive.zip, archive.unzip
 2015-01-14 12:16:55 -07: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
Rupesh Tare
2ab5d0bfdf test genesis tests 2015-01-14 16:29:14 +05:30
Rupesh Tare
8dc9287d5d test firewalld tests 2015-01-14 16:26:23 +05:30
Jayesh
a17dfc96fb Added unit test for data 2015-01-14 15:20:16 +05:30
Erik Johnson
24752ffe93 Fix archive tests 2015-01-13 22:19:14 -06:00
Erik Johnson
904f9b6c90 Fix archive tests 
This fixes references to the badly-named legacy zip and unzip functions,
as well as skipping the unrar test when neither unrar and rar are
installed.
 2015-01-13 21:07:23 -06:00
Mike Place
c172470c30 Try giving some rest tornado requests a little more time 2015-01-13 14:17:55 -07:00
Mike Place
845271d31c More linting 2015-01-13 11:15:45 -07:00
Thomas S Hatch
a16824ec48 Merge pull request #19680 from jayeshka/cpan-unit-tests 
adding cpan test case
 2015-01-13 08:26:31 -07:00
Thomas S Hatch
f1391fb8d9 Merge pull request #19667 from cachedout/ssh_tests 
Fix tests
 2015-01-13 08:14:34 -07:00
Rupesh Tare
721fffa02c fix pylint errors 2015-01-13 19:54:49 +05:30
Rupesh Tare
f8f28580df test ddns module 2015-01-13 19:00:17 +05:30
Jayesh
87baaa915f adding chef unit test case 2015-01-13 18:23:32 +05:30
Jayesh
d2a5eda14a resolved pylint error 2015-01-13 17:54:45 +05:30
Jayesh
2aa6479d25 adding cpan test case 2015-01-13 15:56:21 +05:30
Thomas S Hatch
c368b88963 Merge pull request #19665 from cachedout/tornado_test_timeout 
Fix tornado tests
 2015-01-12 22:15:03 -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
Aurynn Shaw
b7ae48642a Adds fire_master to the Salt Event library, for use in 3rd-party code. 2015-01-13 09:29:27 +13:00
Thomas S Hatch
b7899b2935 Merge pull request #19058 from cournape/add_darwin_pkg_support 
Add darwin pkg support
 2015-01-12 11:43:44 -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
eeb6dadc21 Merge branch '2015.2' into develop 2015-01-12 17:13:57 +00:00
Pedro Algarvio
0ceda58bd6 Fix mock call. 2015-01-12 16:51:02 +00:00
Pedro Algarvio
9e121e3317 Fix brew unit tests 2015-01-12 02:30:38 +00: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
Thomas S Hatch
cad85fd81b Merge pull request #19583 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-01-09 17:49:43 -07:00
Thomas S Hatch
91d0b5b75c Merge pull request #19562 from rupeshta/debconfmod_unit_tests 
Implemented unit test cases for debconfmod module
 2015-01-09 17:14:56 -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
35596415b2 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/modules/brew.py
	salt/modules/disk.py
 2015-01-09 12:57:49 -07:00
Nicole Thomas
e46ccc8210 Merge pull request #19579 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-01-09 12:51:48 -07:00
Mike Place
1526d1e788 Merge pull request #19574 from rallytime/better_test_fix 
Cleaner and actual fix for the failing weird pip test for CentOS 5
 2015-01-09 11:39:42 -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
Mike Place
2ee4bead9e Adjust for a possible subtle bug in zeromq 2015-01-09 11:10:02 -07:00
Mike Place
cc6c2828ab Adjust for a possible subtle bug in zeromq 2015-01-09 11:08:39 -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
Rupesh Tare
e5bdbf592c Implemented unit test cases for dnsmasq module 2015-01-09 17:06:59 +05:30
Rupesh Tare
84afffcb0a Implemented unit test cases for debconfmod module 2015-01-09 17:05:13 +05:30
Thomas S Hatch
4ff285a002 Merge pull request #19511 from gracinet/19329-pillar-introspection 
Provide modules.pillar.obfuscate and modules.pillar.ls
 2015-01-08 16:56:53 -07:00
Thomas S Hatch
31f825d9f2 Merge pull request #19539 from terminalmage/fix-archive-tests 
Update archive tests to use python_shell=False
 2015-01-08 16:43:09 -07:00
rallytime
ea769829af Fix my pylint errors 2015-01-08 15:09:55 -07:00
Colton Myers
174290b7aa Add python_shell=False to all the linux_acl mocks 2015-01-08 14:29:41 -07:00
Colton Myers
4f851c99ab Fix gem tests 2015-01-08 14:26:04 -07:00
rallytime
41841701e7 Fix djangomod.py integration test failures 2015-01-08 12:57:11 -07:00
rallytime
2443d11282 Change file perms back to executable 2015-01-08 12:56:27 -07:00
rallytime
8eab15780e Change file perms on runtests.py 2015-01-08 12:56:17 -07:00
rallytime
a150447b15 pylint fix 2015-01-08 12:56:09 -07:00
rallytime
6f74048688 Fix blockdev module unit tests 2015-01-08 12:55:59 -07:00
Erik Johnson
ab23bf0332 Update archive tests to use python_shell=False 2015-01-08 13:51:47 -06: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
Thomas S Hatch
1e670f7b3e Merge pull request #19478 from thatch45/qp_shell 
shellisms for q and p modules
 2015-01-08 11:54:44 -07:00
Colton Myers
4760dc0fb0 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-01-08 11:45:43 -07:00
Colton Myers
f31128bcc6 Merge pull request #19492 from basepi/shell01 
Set python_shell=false
 2015-01-08 11:45:29 -07:00
Colton Myers
a60fa6b3d1 Merge branch '2015.2' into develop 2015-01-08 11:29:08 -07:00
Colton Myers
d516dc07a2 Merge pull request #19487 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-01-08 11:28:20 -07:00
Colton Myers
522467f546 Fix gem failure 2015-01-08 10:42:55 -07:00
Mike Place
bb0c32e44d Another missed quote 
Conflicts:
	tests/unit/modules/postgres_test.py
 2015-01-08 10:17:39 -07:00
Mike Place
68b6815883 Another missed quote 2015-01-08 10:16:02 -07:00
Thomas S Hatch
792b0ba9c6 added the shell call to too many tests 2015-01-08 10:13:50 -07:00
Mike Place
d6ce858c23 Try giving some rest tornado requests a little more time 2015-01-08 10:04:19 -07:00
Georges Racinet
e94fe6de31 Mark function as private 
With the leading underscore, _obfuscate_inner should be excluded from the CLI
(and the related lint tests)
 2015-01-08 17:41:49 +01:00
rallytime
5490530504 Change the install package to fix pip tests 2015-01-08 09:32:53 -07:00
Colton Myers
e7b79de8da Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/ebuild.py
 2015-01-08 09:28:12 -07:00
Rupesh Tare
0de948f03b Implemented unit test cases for cassandra module 2015-01-08 18:57:58 +05:30
Rupesh Tare
27a28e02c7 bug fixing 2015-01-08 14:23:45 +05:30
Georges Racinet
eb70dcf67d Provide modules.pillar.obfuscate and modules.pillar.ls 
This fulfills #19329. As explained there, 'ls' is not that useful, but
still including it for completeness.
Also first attempt at writing a unit test within salt.
 2015-01-08 09:44:51 +01:00
Mike Place
96fdbc474a Fix postgres test 2015-01-07 22:38:51 -07:00
rallytime
8bf6edcf45 Merge branch '2015.2' into merge_forward_develop 2015-01-07 21:08:40 -07:00
rallytime
4aa60ce51a Fix linux_acl tests 2015-01-07 20:55:19 -07:00
Erik Johnson
5edba8e55e Add back double-quote 
This is in the actual dig output, I shouldn't have removed it.
 2015-01-07 20:05:43 -06:00
Erik Johnson
98e2e33338 Fix dig tests 
This fixes the dig tests after dig.py was modified to use
python_shell=False.
 2015-01-07 19:59:16 -06:00
rallytime
74a1861655 Merge branch '2015.2' into merge_forward_develop 2015-01-07 17:01:25 -07:00
Mike Place
6dcd749b2b Merge pull request #19494 from cachedout/fix_failing_postgres 
Some expressions are not so regular
 2015-01-07 16:11:27 -07:00
Mike Place
3830162952 Some expressions are not so regular 2015-01-07 15:53:07 -07:00
Thomas S Hatch
0e1683672f first round of pip test updates 2015-01-07 14:54:36 -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
Thomas S Hatch
a60ce30962 Merge pull request #19455 from jfindlay/split_uwsgi 
split uwsgi command
 2015-01-07 13:51:45 -07:00
Justin Findlay
d8785de0fd fix uwsgi test 2015-01-07 11:57:44 -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
Thomas S Hatch
c9b003ac66 Merge pull request #19445 from rupeshta/devmap_unit_tests 
Implemented unit test cases devmap module
 2015-01-07 10:21:12 -07:00
Thomas S Hatch
f5572a3308 Merge pull request #19443 from rupeshta/bridge_unit_tests 
Implemented unit test cases for bridge module
 2015-01-07 10:20:17 -07:00
Thomas S Hatch
48097d7fed Merge pull request #19442 from rupeshta/daemontools_unit_tests 
Implemented unit test cases for module daemontools
 2015-01-07 10:20:02 -07:00
Thomas S Hatch
3252ca95ce Merge pull request #19441 from rupeshta/composer_unit_tests 
Implemeted unit test cases for module composer
 2015-01-07 10:19:16 -07:00
rallytime
fe4fd7a5a3 Use skip_if_binaries_missing decorator 2015-01-07 10:11:26 -07:00
Thomas S Hatch
58fd3cc575 Merge pull request #19377 from jayeshka/augeas_cfg_unit_test 
adding augeas_cfg unit test case
 2015-01-07 10:08:03 -07:00
Thomas S Hatch
a0225079a5 Merge pull request #19324 from whiteinge/git_pillar-branch-env-mapping 
Added git_pillar branch to environment mapping
 2015-01-07 10:06:30 -07:00
jfindlay
f329ec9104 Merge pull request #19422 from Seveland12/develop 
Fixed spelling of "below" in 9 different files.
 2015-01-07 09:32:44 -07:00
rallytime
98a290ab04 Fix file permissions pylint error 2015-01-07 08:52:32 -07:00
rallytime
5f6af88afb Merge branch '2015.2' into 'develop' 2015-01-07 07:54:10 -07:00
Rupesh Tare
f231b5dd35 Implemented unit test cases devmap module 2015-01-07 18:49:12 +05:30
Rupesh Tare
73ccbf6b37 Implemented unit test cases fordebian_service module 2015-01-07 18:46:47 +05:30
Rupesh Tare
94f6372678 Implemented unit test cases for bridge module 2015-01-07 18:07:36 +05:30
Rupesh Tare
a760eaea4a Implemented unit test cases for module daemontools 2015-01-07 17:56:06 +05:30
Rupesh Tare
7a83039a5a removed unused import 2015-01-07 17:42:56 +05:30
Rupesh Tare
24e1e40550 Implemeted unit test cases for module composer 2015-01-07 17:39:00 +05:30
Rupesh Tare
09b6088b62 Implemented unit test cases for module environ 2015-01-07 17:21:17 +05:30
Pedro Algarvio
06fdee00c8 Merge pull request #19426 from rallytime/merge_forward_fifteen 
Merge forward 2014.7 into 2015.2
 2015-01-07 09:27:40 +00:00
Jayesh
2d3e40d69a added check for augeas python package 2015-01-07 14:19:35 +05:30
Mike Place
2474cdfde0 Allow for variations in distros in group test 2015-01-06 22:46:28 -07:00
Mike Place
1700450dd8 Merge pull request #19432 from cachedout/fix_group_test 
Allow for variations in distros in group test
 2015-01-06 22:05:53 -07:00
Mike Place
309f91a979 Allow for variations in distros in group test 2015-01-06 22:04:19 -07:00
Mike Place
f06b5ae344 Merge pull request #19427 from cachedout/kmod_skip 
Skip kmod test if /etc/modules isn't present
 2015-01-06 20:37:39 -07:00
Mike Place
22ccbf0542 Skip kmod test if /etc/modules isn't present 2015-01-06 20:36:45 -07:00
rallytime
80b07f3578 Merge branch '2014.7' into '2015.2' 
Conflicts:
	tests/buildpackage.py
 2015-01-06 20:32:36 -07:00
Nicole Thomas
dbbab28cdc Merge pull request #19425 from s0undt3ch/2014.7 
Ignore the file perms lint check
 2015-01-06 18:22:01 -07:00
Nicole Thomas
5abf095fc7 Merge pull request #19418 from rallytime/fix_more_develop_tests 
Fix blockdev module unit tests
 2015-01-06 18:19:43 -07:00
rallytime
cb5375043c Change file perms back to executable 2015-01-07 01:16:34 +00:00