Commit Graph

4214 Commits

Author SHA1 Message Date
twangboy
a904e8329b Fixed another test failure... 2015-07-27 15:05:23 -06:00
twangboy
aa077d3a86 Fixed more tests... justin findlay helped me... 2015-07-27 11:18:25 -06:00
twangboy
87c8f8dfb5 Fixed some tests... maybe... 2015-07-24 15:07:45 -06:00
Andreas Lutro
dd2a188c05 fix tests 2015-07-23 15:17:18 +02:00
Erik Johnson
123b8ee1cb Fix mock_open patch
Forgot to add this when I removed the decorator in my previous commit.
2015-07-22 11:09:15 -05:00
Erik Johnson
af82835f42 Move patching of mock_open to within test
This keeps the tests from failing on platforms like RHEL6 where
unittest2 has no mock_open.
2015-07-22 03:04:07 -05:00
twangboy
5008bfee96 Merge branch '2015.5' of https://github.com/saltstack/salt into fix_21041_again 2015-07-20 12:51:43 -06:00
twangboy
8b2dc681f9 Fixed the gem module to work on windows... without injection 2015-07-20 12:50:33 -06:00
Joe Julian
1b7a56aa38 Add support for pyOpenSSL > 0.10
Centos 6 doesn't provide a packaged version of pyOpenSSL > 0.10. Allow
the tls module to work with that minimum version. This will not allow
X509 extensions to work but will allow everything else.

Fixes #25384
2015-07-15 16:49:54 -07:00
Seth House
cb98d79cdd Merge pull request #25457 from jacksontj/saltnado
Saltnado
2015-07-15 11:50:12 -06:00
Thomas Jackson
bc32f66b98 Add runner_async endpoint to salnado
Feature for #25427
2015-07-15 09:07:26 -07:00
Mike Place
cfec990062 Merge pull request #25433 from jleroy/ipv6-scope-support-ifconfig
Support for IPv6 addresses scopes in network.interfaces (ifconfig)
2015-07-15 08:44:09 -06:00
Pedro Algarvio
c4b15840c6 Additional test case for question raised in #1846
https://github.com/saltstack/salt/issues/1864#issuecomment-102246258
2015-07-15 14:29:43 +01:00
Jonathan Leroy
bc36d05c0c
Support for IPv6 addresses scopes in network.interfaces (ifconfig) 2015-07-15 01:14:32 +02:00
Thomas S Hatch
9b6646d578 Merge pull request #25269 from jfindlay/tomcat
Extract tomcat war version
2015-07-09 19:28:21 -06:00
Justin Findlay
59dc833567 update tomcat war_deployed state tests 2015-07-08 15:39:52 -06:00
rallytime
f959e165a1 Clean up imports 2015-07-07 06:28:10 -06:00
rallytime
fbc9c0d6bf Fix Pylint 2015-07-07 05:43:00 -06:00
rallytime
fe2561f415 Update moto version check in boto_vpc_test and update min version
Fixes #24272
2015-07-06 14:03:59 -06:00
Justin Findlay
071ee44d41 Revert "Revert "adding states/postgres_database unit test case."" 2015-07-01 09:47:08 -06:00
Justin Findlay
bf8c7e7a9d Merge pull request #24362 from jayeshka/postgres_user-states-unit-test
adding states/postgres_user unit test case.
2015-07-01 15:45:31 -06:00
Justin Findlay
4195cea512 Merge pull request #24361 from jayeshka/postgres_schema-states-unit-test
adding states/postgres_schema unit test case.
2015-07-01 15:44:56 -06:00
Justin Findlay
ada8fe57d4 Merge pull request #24331 from jayeshka/postgres_extension-states-unit-test
adding states/postgres_extension unit test case.
2015-07-01 15:43:58 -06:00
Justin Anderson
21709aa483 Merge pull request #25096 from jfindlay/postgres_group_test
Postgres group test
2015-07-01 12:48:25 -06:00
David Boucha
0a846400c6 Merge pull request #25085 from jfindlay/fix_file
accept all sources in the file state
2015-07-01 12:23:45 -06:00
Justin Findlay
a98394210e Merge pull request #25095 from jfindlay/win_groupadd_test
Win groupadd unit tests
2015-07-01 12:18:53 -06:00
Justin Findlay
3c379dc115 declobber postgres state unit test mocking 2015-07-01 12:01:50 -06:00
Justin Findlay
564dffd14a depend on win libs rather than mocking them 2015-07-01 11:14:19 -06:00
Justin Findlay
937a252e16 remove unnecessary file state tests 2015-06-30 17:16:17 -06:00
Justin Findlay
6f238e924c integration test file.managed sources 2015-06-30 14:26:59 -06:00
Jayesh Kariya
e3045be5a9 adding redismod unit test case. 2015-06-29 14:13:45 +05:30
Jayesh Kariya
bb0a6d5625 adding states/supervisord unit test case. 2015-06-26 13:06:53 +05:30
Mike Place
a71c1b7c8b Merge pull request #24966 from garethgreenaway/2015_5_24862_gpg_import_key
Fixes to gpg.py in 2015.5
2015-06-25 13:58:49 -06:00
Gareth J. Greenaway
55eb73b0c9 fixing unit tests. 2015-06-25 11:33:36 -07:00
Thomas Jackson
87adca46e0 Fix memory leak in saltnado
Fixes #24846

If an event was checked after the request was closed out it was possible for requests to get into the event_listener's mapping and never be cleaned out. This fixes the leak by checking if the request is open or not before adding it to the mappings.
2015-06-25 09:06:33 -07:00
Justin Findlay
90819f9c37 Merge pull request #24923 from jayeshka/status-states-unit-test
adding states/status unit test case.
2015-06-24 09:50:07 -06:00
Jayesh Kariya
baec650674 adding states/status unit test case. 2015-06-24 17:23:13 +05:30
Jayesh Kariya
ef1347f2b3 adding states/ssh_known_hosts unit test case. 2015-06-23 15:53:46 +05:30
Jayesh Kariya
e5d7b0de80 adding states/ssh_auth unit test case. 2015-06-22 17:29:08 +05:30
Jayesh Kariya
98831a8cb0 adding states/splunk_search unit test case. 2015-06-19 15:15:49 +05:30
Colton Myers
ae05e70e94 Merge pull request #24802 from basepi/merge-forward-2015.5
[2015.5] Merge forward from 2014.7 to 2015.5
2015-06-18 14:11:58 -06:00
twangboy
98e7e90299 Fixed test failures for Colton 2015-06-18 12:58:18 -06:00
Justin Anderson
179ce03d93 Revert "adding states/postgres_database unit test case." 2015-06-18 10:24:11 -06:00
C. R. Oldham
1a158e8a3b Merge pull request #24792 from rallytime/bp-24757
Back-port #24757 to 2015.5
2015-06-18 09:58:35 -06:00
C. R. Oldham
0f9298263b Merge pull request #24768 from jfindlay/pkg_mod
fix yum versionlock on RHEL/CentOS 5, disable corresponding test
2015-06-18 09:13:12 -06:00
Mike Place
6c804f0789 Fix loader call in pyobjects 2015-06-18 09:11:45 -06:00
Mike Place
fd7339014b Merge pull request #24782 from jayeshka/slack-states-unit-test
adding states/slack unit test case.
2015-06-18 08:33:55 -06:00
Jayesh Kariya
e2b6214764 adding states/slack unit test case. 2015-06-18 15:47:27 +05:30
Thomas Jackson
b1211c5422 Re-enable tests for complex prereq and prereq_in
Since #24770 is fixed, #8211 is also fixed (since they are basically the same issue)
2015-06-17 21:57:37 -07:00
Justin Findlay
7a26c2b5b9 disable pkg.hold test for RHEL/CentOS 5 2015-06-17 16:36:36 -06:00