Commit Graph

3687 Commits

Author SHA1 Message Date
jfindlay
8133907a62 Merge pull request #19786 from jayeshka/defaults-unit-test
Adding defaults unit test case
2015-01-17 20:35:37 -07:00
jfindlay
d04dee8443 Merge pull request #19685 from rupeshta/ddns_unit_tests
test ddns module
2015-01-17 20:34:27 -07:00
jfindlay
d7d15e3a60 Merge pull request #19821 from jfindlay/debian_service_unit_tests
fix debian service unit tests
2015-01-17 17:47:18 -07:00
jfindlay
8ea53a73eb Merge pull request #19822 from jfindlay/dnsmasq_unit_test
fix dnsmasq unit tests
2015-01-17 17:44:47 -07:00
Justin Findlay
9202cbba78 fix dnsmasq unit tests 2015-01-17 15:44:45 -07:00
jfindlay
b42029b3c6 Merge pull request #19819 from jfindlay/environ_unit_tests
fix environ unit tests
2015-01-17 15:42:21 -07:00
Justin Findlay
555dbd66ab fix debian_service unit tests 2015-01-17 15:31:52 -07:00
jfindlay
4234a76d0e Merge pull request #19817 from jfindlay/cassandra_unit_tests
fix cassandra unit tests
2015-01-17 15:10:25 -07:00
Justin Findlay
770258e511 fix environ module unit tests 2015-01-17 15:07:25 -07:00
Justin Findlay
9d18f7a879 fix cassandra unit tests 2015-01-17 14:02:38 -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
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