valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
44,732 Commits 24 Branches 182 Tags 341 MiB
6d14d4e661
Commit Graph

756 Commits

Author SHA1 Message Date
Thomas S Hatch
3d73816507 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/virtualenv_mod.py
	salt/states/network.py
	salt/utils/parsers.py
 2014-12-09 10:59:18 -07:00
rallytime
8211dc2f00 Patch unittests when calling _validate_device 2014-12-09 10:48:02 -07:00
rallytime
db9ae406c3 Fix mocked calls in unit/modules/archive_test.py 
This is due to the changes in #18621
 2014-12-09 08:36:30 -07:00
Justin Findlay
b7467f5f45 update venv unit tests accordingly 2014-12-08 23:28:28 -07:00
Anthony Scalisi
44963fae0e fix various typos 2014-12-08 14:32:53 -08:00
Colton Myers
472f6577e2 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/minion.py
	salt/modules/localemod.py
	salt/states/mount.py
	salt/transport/__init__.py
	salt/utils/schedule.py
 2014-12-04 11:11:11 -07:00
Pedro Algarvio
04fe9382aa Merge pull request #18585 from rallytime/cmd_unittests 
Added some more cmdmod unittests
 2014-12-02 15:54:57 +00:00
Pedro Algarvio
55b68c389d Merge branch '2014.7' into develop 
Conflicts:
	tests/unit/modules/boto_vpc_test.py
 2014-12-02 01:40:47 +00:00
Pedro Algarvio
83153354c4 Remove PyLint disable rule in 2014.7 
Since it's unlikely we upgrade PyLint in this branch
 2014-12-02 01:37:42 +00:00
Pedro Algarvio
2396568dd5 Remove unused import 2014-12-02 01:36:49 +00:00
Pedro Algarvio
b37c76a800 Merge branch '2014.7' into develop 
Conflicts:
	tests/unit/modules/boto_vpc_test.py
 2014-12-02 01:09:15 +00:00
Pedro Algarvio
6530a7911e Disable the false import error 2014-12-02 01:06:56 +00:00
Pedro Algarvio
50105aa001 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/boto_secgroup.py
	salt/modules/boto_vpc.py
	tests/unit/modules/boto_vpc_test.py
 2014-12-01 23:07:39 +00:00
rallytime
a26cd377ff More cmdmod unittests 2014-12-01 08:57:11 -07:00
rallytime
c3d90c9f4f If umask=0 is provided, enter the umask if statement 
Previously the 'Zero umask is not allowed' statement was not getting hit
Also updated the appropriate umask tests
 2014-12-01 08:57:10 -07:00
rallytime
98b06be08a Added some more cmdmod unittests 2014-12-01 08:57:10 -07:00
rallytime
e7cdd75090 Add another cmdmod.py unittest 2014-12-01 08:57:10 -07:00
Pedro Algarvio
be18e8b244 Disable some Pylint errors 2014-12-01 03:24:41 +00:00
Pedro Algarvio
bdf3a3e91c Disable some Pylint errors 2014-12-01 03:24:37 +00:00
Pedro Algarvio
fd9377fefe Disable some Pylint errors 2014-12-01 03:23:52 +00:00
Pedro Algarvio
9d6c855e1a Disable some Pylint errors 2014-11-28 15:33:45 +00:00
Pedro Algarvio
b07707ff96 Disable some Pylint errors 2014-11-28 15:31:55 +00:00
Pedro Algarvio
8a1cc589a1 Disable some Pylint errors 2014-11-28 15:31:01 +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
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
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
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
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
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
starzyk1
50fab573c8 Fixes of pylint violations 2014-11-25 11:51:43 +01:00
rallytime
dc3c8f91bd Pylint fix 2014-11-24 19:44:54 -07:00
rallytime
792433f915 Started some unit tests for the cmdmod.py module 2014-11-24 17:03:52 -07:00
Konrad Starzyk
6656837ff0 Merge remote-tracking branch 'upstream/develop' into jboss7 2014-11-21 21:52:46 +01:00
Pedro Algarvio
0c50d789b7 The imports actually work so shut up PyLint! 2014-11-20 18:22:19 +00:00
Pedro Algarvio
61de0bd629 Let's see if the slash makes a difference 2014-11-20 17:18:12 +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
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
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
Thomas S Hatch
0ea13995de lint 2014-11-11 10:01:33 -07: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
C. R. Oldham
0303154c31 Update tests to respect changes in postgres module 2014-11-10 14:37:44 -07: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
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
Justin Findlay
9e9903c521 add unit tests for salt/modules/cp.py 2014-11-07 16:35:25 -07: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
e4be523ee4 Merge pull request #17234 from thatch45/bemehow-get_vpc_id 
Merge #17181
 2014-11-06 14:06:56 -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
Chris Rebert
b9bb56841d fix numerous typos+misspellings 2014-11-05 13:57:47 -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
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
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
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
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
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
Mathieu Le Marec - Pasquet
2b4d7e3080 Support for vt in pip & venv modules 2014-10-23 20:18:44 +02:00
Cimarron Mittelsteadt
43fea4f3ea TST: Updated mac_user tests for modifications to OS release handling 2014-10-21 15:00:58 -06:00
Cimarron Mittelsteadt
d6abb6c77d TST: Updated mac_user tests for modifications to OS release handling 2014-10-17 09:28:56 -07:00
rallytime
7e09896c7c Clean up boto_secgroup unit test 
This test required some tweaks as there are new versions of boto and moto
 2014-10-10 16:35:08 -06:00
rallytime
e15bf67fba Clean up boto_secgroup unit test 
This test required some tweaks as there are new versions of boto and moto
 2014-10-10 16:03:21 -06:00
Seth House
b0615f9bbf Merge remote-tracking branch 'upstream/2014.7' into develop 2014-10-08 14:40:32 -06:00
Gareth J. Greenaway
9ae138e1a4 Fixing the unit tests for ps module 2014-10-07 20:56:02 -07:00
rallytime
6212cfba12 Fix assertion messages to match and pass tests 2014-10-07 09:36:04 -06:00
rallytime
d8e7feafce Clean up last expectedFailure 2014-10-07 08:42:31 -06:00
rallytime
5ff51987b9 Pylint fix 2014-10-07 08:31:42 -06:00
rallytime
868a6e5459 Change expectedFailures to @skipIfs 2014-10-07 08:13:09 -06:00
rallytime
6a1da81a99 Pylint fix 2014-10-06 20:48:00 -06:00
rallytime
274c61b694 Add docstrings to boto_vpc unit tests 2014-10-06 16:52:57 -06:00
Omer Katz
f5c92d70ff Fixed possible test module import failure when boto is not installed. 2014-10-02 15:01:49 +03:00
Omer Katz
5620eddb2d Removed unused import. 2014-10-02 14:32:51 +03:00
Omer Katz
430fea55e2 Added missing check for arguments in route_table_exists(). 2014-10-02 14:26:40 +03:00
Omer Katz
f7bb4b3b67 Added missing check for arguments in network_acl_exists and fixed DHCP options test. 2014-10-02 14:26:39 +03:00
Omer Katz
02654ce0d4 Added missing check for arguments in dhcp_options_exists. 2014-10-02 14:26:39 +03:00
Omer Katz
b0f11e2e70 Added missing check for arguments in subnet_exists. 2014-10-02 14:26:39 +03:00
Omer Katz
2514d3824b Addressing review from @ryan-lane. exists will now raise a SaltInvocationError when arguments are not specified. 2014-10-02 14:26:39 +03:00
Omer Katz
1233e9e2e6 Added the ability to check for existence of subnets by name or tags. 2014-10-02 14:26:39 +03:00
Omer Katz
ab950936e1 Verified that when providing no filters the vpc_exists method returns false. 2014-10-02 14:26:39 +03:00
Omer Katz
3c03cefb3a Added support for filtering vpcs by name or tags. 2014-10-02 14:26:39 +03:00
Omer Katz
1bfff3a573 Rename test names. 2014-10-02 14:26:39 +03:00
Omer Katz
1fc37e22b6 DHCP tests will now be skipped correctly. 2014-10-02 14:26:39 +03:00
Omer Katz
b3f3b96ff7 Fixed test name. 2014-10-02 14:26:39 +03:00
Omer Katz
e0200ccd56 Skip DHCP tests for now. 2014-10-02 14:26:39 +03:00
Omer Katz
dbadd0b474 Added the ability to replace routes. Fixed failing tests. 2014-10-02 14:26:38 +03:00
Omer Katz
98e669e2f1 Added the ability to delete routes. 2014-10-02 14:26:38 +03:00
Omer Katz
ff48e4aebf Added the ability to create routes. 2014-10-02 14:26:38 +03:00
Omer Katz
4110fb06eb Added the ability to associate route tables. 2014-10-02 14:26:38 +03:00
Omer Katz
40230406fb Added the ability to disassociate a route table. 2014-10-02 14:26:38 +03:00
Omer Katz
dc377b9ece Added the ability to disassociate network acl. 2014-10-02 14:26:38 +03:00
Omer Katz
4e5d07e926 Added the ability to check for existence of route tables. 2014-10-02 14:26:38 +03:00
Omer Katz
312fa78c31 Fixed route table tests. 2014-10-02 14:26:38 +03:00
Omer Katz
f3538b40d2 Added the ability to delete route tables. 2014-10-02 14:26:38 +03:00
Omer Katz
a8e9fcaa3e Added the ability to create route tables. 2014-10-02 14:26:38 +03:00
Omer Katz
5abbc62ccf Added the ability to associate a network acl to a subnet and to create it and associate it in one operation. 2014-10-02 14:26:38 +03:00
Omer Katz
69f7d7c3b1 Added the ability to tag network acls. 2014-10-02 14:26:38 +03:00
Omer Katz
8d48df06c7 Added the ability to create/delete/replace network acl entries. Tests will fail correctly since moto doesn't support faking network acls yet. 2014-10-02 14:26:38 +03:00
Omer Katz
a8c6288196 Added the ability to create/delete/check for existence of network acl. Tests will fail correctly since moto doesn't support faking network acls yet. 2014-10-02 14:26:38 +03:00
Omer Katz
97cd112fcf Refactoring the test module since it's getting bigger. 2014-10-02 14:26:37 +03:00
Omer Katz
b5aaa2b3e8 Added unit tests that verify that dhcp options creation and association reports success/failure correctly. 2014-10-02 14:26:37 +03:00
Omer Katz
0bae036a21 Added unit tests that verify that dhcp options existence reports success/failure correctly. 2014-10-02 14:26:37 +03:00
Omer Katz
f943fb9364 Fixed the subnet exists test. 2014-10-02 14:26:37 +03:00
Omer Katz
450a5a4570 Added unit tests that verify that subnet existence reports success/failure correctly. 2014-10-02 14:26:37 +03:00
Omer Katz
18e913a41f Added the ability to tag ec2 objects. 2014-10-02 14:26:37 +03:00
Omer Katz
888e2ce35e Fixed typo. 2014-10-02 14:26:37 +03:00
Omer Katz
fb9d1dbafe Verifyed that all ec2 objects can be named. 2014-10-02 14:26:37 +03:00
Omer Katz
8bbaf96f6e Added unit tests that verify that DHCP association reports success/failure correctly. 2014-10-02 14:26:37 +03:00
Omer Katz
2ed1957427 Added unit tests that verify that DHCP creation reports success/failure correctly. 2014-10-02 14:26:37 +03:00
Omer Katz
b202bcbe04 Allowed tagging a VPC with a name if required. 2014-10-02 14:26:37 +03:00
Omer Katz
86e484fac8 Fixed docstrings. 2014-10-02 14:26:37 +03:00
Omer Katz
e27d82dd3d Added unit tests that verify that subnet deletion reports success/failure correctly. 2014-10-02 14:26:37 +03:00
Omer Katz
f64b9d57b5 Fixed typo. 2014-10-02 14:26:37 +03:00
Omer Katz
869cfe580d Added unit tests that verify that vpc deletion reports success/failure correctly. 2014-10-02 14:26:37 +03:00
Omer Katz
4004f09cd0 Refactoring the test suite. 2014-10-02 14:26:36 +03:00
Omer Katz
e4f8340201 Added unit tests that verify that subnet creation reports success/failure correctly. 2014-10-02 14:26:36 +03:00
Omer Katz
78def8c70b Added unit tests that verify that vpc creation reports success/failure correctly. 2014-10-02 14:26:36 +03:00
Dave Rawks
9b761f378d More test coverage for salt.modules.parted 
* Full coverage for "list_" method
 2014-09-23 15:44:33 -07:00
Dave Rawks
a3707e2bab Simplify mock of cmd.run via setUp method 
* reduced code duplication by handling a frequently used mock in setUp
method to testcase
 2014-09-22 14:44:52 -07:00
Dave Rawks
8c0266486e Merge branch 'develop' of https://github.com/saltstack/salt into parted_tests 2014-09-22 11:35:41 -07:00
Dave Rawks
6e6bf0e643 First pass at adding unit tests to salt.modules.parted 
Full coverage for __virtual__, probe, and part_list
 2014-09-22 11:16:37 -07:00
rallytime
936a6bca5a Fix mdadm tests 2014-09-19 16:35:43 -06:00
Thomas S Hatch
d60804a709 lint fixes for #15695 2014-09-12 10:42:35 -06:00
Thomas S Hatch
5d27e77c92 Merge branch 'feature/postgres_schema' of https://github.com/novapost/salt into novapost-feature/postgres_schema 2014-09-12 10:39:40 -06:00
Thomas S Hatch
d6e3e01c6d Merge pull request #15392 from ihrwein/f/add-syslog-ng-modules 
F/add syslog ng modules
 2014-09-12 10:37:02 -06:00
Rodolphe Quiédeville
b4dcc992c5 - salt/modules/postgres.py: add functions to manipulate schemas 
- salt/states/postgres_schema.py: new states for schemas
- tests/unit/modules/postgres_test.py: add tests on new functions
- tests/unit/states/postgres_test.py: add tests on new functions
 2014-09-11 12:17:18 +02:00
rallytime
f7a00ce643 Fix mdadm tests 2014-09-09 07:07:23 -06:00
Dave Rawks
873ca1e0b1 Updated test to account for additional flag 2014-09-05 10:08:17 -07:00
Thomas S Hatch
e34e81f41b Merge branch '2014.7' into develop 
Conflicts:
	salt/minion.py
 2014-09-05 11:03:12 -06:00
Thomas S Hatch
70950a1543 Merge pull request #15510 from lyft/boto_elb_resolve_error_on_deregister_instances_call 
deregister_instances and register_instances methods return True/False/None
 2014-09-04 15:32:45 -06:00
Colin Johnson
754c01448e provide True, False and None returns on deregister_instances and register_instances methods 2014-09-04 05:53:52 +00:00
Colton Myers
c127b4bafe Bring boto module tests from develop to 2014.7 2014-09-03 15:22:17 -06:00
Cimarron Mittelsteadt
8326182e5e TST: Updated brew module unit test to patch the appropriate __salt__ functions for the updates to brew module 2014-09-02 11:12:01 -07:00
btibi
69b0deacf6 syslog_ng: add syslog-ng state and execution modules 2014-08-29 23:20:25 +02:00
Gavin Swanson
d972aeff55 Merge branch 'addCygwin' into develop 2014-08-23 15:56:32 -07:00
rallytime
2285a10a95 Use salt.utils.odict instead of python2.7 OrderedDict 2014-08-20 09:24:52 -06:00
Nicole Thomas
37420dfed3 Merge pull request #15012 from lyft/boto_vpc-boto_secgroup-resolve-unit-test-failures 
Boto vpc boto secgroup resolve unit test failures
 2014-08-19 13:05:14 -06:00
Colin Johnson
9e797d6664 skip if mock not found 2014-08-19 16:19:41 +00:00
Colin Johnson
72b9ebe304 move to LooseVersion for Boto version testing 2014-08-15 23:05:05 +00:00
Colin Johnson
c3a6f3d727 fix boto versions for boto_secgroup and boto_vpc 2014-08-15 22:57:44 +00:00
Colton Myers
932aa97e1f Merge branch '2014.7' into develop 2014-08-15 16:33:02 -06:00
Gavin Swanson
c8d19409f6 Add cygwin package installation 
Currently only hadles adding packages. Does not remove packages. It is
setup to update packages any time it is run, but there is no independent
update functionality.
Curently no unit/integration testing is done. I haven't wrapped my head
around the way the mocking and stuff is done yet.
 2014-08-15 14:13:22 -07:00
Colin Johnson
86bcea16ee resolve issue with boto < 2.4.0 GroupOrCIDR attributes 2014-08-15 18:58:26 +00:00
rallytime
e8fab3d28a Fix psutil version 2014-08-14 21:22:55 -06:00
rallytime
0683c704dd Move psutil version check 2014-08-14 21:20:25 -06:00
Colin Johnson
41c51b4044 resolve issue with Ubuntu 12.0.4 failures 2014-08-15 01:12:43 +00:00
rallytime
8dca2515ee Skip virtual_memory and swap_memory tests if psutil < 0.6.0 2014-08-14 16:16:38 -06:00
rallytime
f9e481e49d Add needs_daemon=False to run_tests 2014-08-12 16:57:34 -06:00
rallytime
d57fc99bca Move mock_ec2 decorator back to functions 2014-08-12 09:20:17 -06:00
rallytime
5fff2f9b3f Rename boto tests files to include '_test' at the end 2014-08-11 17:01:42 -06:00
Nicole Thomas
64ee26aa57 Merge pull request #14897 from rallytime/boto_test_fixes 
Update imports and skipIfs on boto unit tests
 2014-08-11 17:01:01 -06:00
Seth House
b5bf67fdd1 Merge branch 'copyediting' of https://github.com/hulu/salt into develop 
Conflicts:
	salt/states/win_update.py
 2014-08-11 18:23:44 -04:00
Pedro Algarvio
09acfae48e Bring the global variables more into their context 2014-08-11 22:25:21 +01:00
rallytime
cc5c3bc1ad Update imports and skipIfs on boto unit tests 2014-08-11 12:57:45 -06:00
Chris Rebert
7da0f0a8b6 fix "retreived" typos 2014-08-11 11:52:30 -07:00
Chris Rebert
177c168a21 Fix numerous typos found via Lintian 
Thanks https://github.com/Debian/lintian/tree/master/data/spelling !
 2014-08-11 10:46:43 -07:00
Thomas S Hatch
b166b0c7c1 Merge branch '2014.7' into develop 2014-08-08 15:48:01 -06:00
Pedro Algarvio
c9be462f00 Skip tests if real mock library is not available 2014-08-08 00:52:47 +01:00
Pedro Algarvio
a399e62ca2 Skip tests if real mock library is not available 2014-08-08 00:46:21 +01:00
Pedro Algarvio
97f1b00818 Skip tests if real mock library is not available 2014-08-08 00:46:21 +01:00
Pedro Algarvio
faf3157637 Skip tests if real mock library is not available 2014-08-08 00:46:21 +01:00
Thomas S Hatch
d6e3e31a22 lint fixes 2014-08-05 12:08:05 -06:00
Colin Johnson
d26b671b00 add vpc support in boto_secgroup execution module 2014-08-05 03:45:00 +00:00
Colin Johnson
8dd88066f7 boto_asg now support use of security group names in launch configs 2014-08-04 00:04:20 +00:00
Seth House
d7d8beabb8 Merge remote-tracking branch 'upstream/2014.7' into develop 2014-07-25 19:55:43 -06:00
Seth House
adabf74852 Added utils module for working with hash functions 2014-07-25 16:12:37 -06:00
Seth House
ac6c7d0d6d Added utils-style IP-check functions to the network module 2014-07-25 15:20:14 -06:00
Rob Messick
74cf92331b add optional pre_releases argument to gem.install 2014-07-24 17:26:27 -07:00
Colin Johnson
c8e8bf1577 LYFT-14491 - unit tests for rule modification 2014-07-23 22:59:38 +00:00
rallytime
a3da60def4 Remove unnecessary print statement 2014-07-22 12:16:39 -06:00
rallytime
81e06fa252 Removed deprecated functions in salt/modules/ps.py 2014-07-16 12:49:45 -06:00
rallytime
1c3737a883 Remove remaining references and tests to no_site_packages 2014-07-16 06:00:08 -06:00
rallytime
4d329296b0 Remove unused import 2014-07-15 18:15:58 -06:00
rallytime
534f3df900 Remove test for no_site_packages deprecation 2014-07-15 17:28:40 -06:00
Leonids Maslovs
6c3973ec05 WIP 13793 Unit tests fixed 2014-07-15 13:19:07 +03:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
Pedro Algarvio
7862600683 Remove syslog-ng tests. Refs #14163 2014-07-13 00:09:45 +01:00