valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
73,610 Commits 24 Branches 182 Tags 341 MiB
0e84fc888d
Commit Graph

73610 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
0e84fc888d Merge pull request #36151 from eyj/req-fix 
Ignore states that do not have a numeric jid, i.e. 'req'
 2016-09-09 18:49:54 +09:00
Mike Place
a0665a431d Merge pull request #36175 from plastikos/cleanup-redundant_key_write 
[TRIVIAL] Remove redundant write of public key.
 2016-09-09 18:43:24 +09:00
Nicole Thomas
817cd9f42a Merge pull request #36177 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-08 22:43:22 -06:00
rallytime
2edfef33ae Merge branch 'carbon' into 'develop' 
Conflicts:
  - salt/scripts.py
  - salt/thorium/key.py
  - tests/unit/cloud/clouds/dimensiondata_test.py
  - tests/unit/cloud/clouds/gce_test.py
 2016-09-08 17:31:29 -06:00
Nicole Thomas
f82c91dbd4 Merge pull request #36174 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-08 17:28:35 -06:00
rallytime
c30f697dfd Pylint fix 2016-09-08 17:23:15 -06:00
Thayne Harbaugh
5e6444b732 Remove redundant write of public key. 2016-09-08 16:26:39 -06:00
rallytime
6da0fbbe96 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/linux_sysctl.py
  - tests/unit/cloud/clouds/dimensiondata_test.py
  - tests/unit/cloud/clouds/gce_test.py
  - tests/unit/modules/boto_iot_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_iot_test.py
  - tests/unit/utils/network.py
 2016-09-08 16:14:04 -06:00
Nicole Thomas
dc3a68ed8c Merge pull request #36158 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-08 15:53:49 -06:00
Joseph Hall
1a7996125a Fix breakage from updates to __utils__ (#36168) 2016-09-08 15:49:45 -06:00
Nicole Thomas
3445a333d5 Remove unclosed backticks in walkthrough doc (#36170) 2016-09-08 15:49:01 -06:00
Thomas S Hatch
93d8a83271 Merge pull request #36086 from twangboy/mac_power_tests 
Fix tests for mac_power module on various systems.
 2016-09-08 14:52:37 -06:00
Thomas S Hatch
736903222a Merge pull request #36122 from twangboy/mac_system_tests 
Fix test not starting, skip broken functions
 2016-09-08 14:42:48 -06:00
Nicole Thomas
0e8e66877a Back-port #36067 to carbon (#36159) 
* Fix signal handling

We had a little mix-up with the args ordering for our signal handling.

This sends the proper signal to processes on cleanup.

I have also temporarily disabled the pytest engines because they were
causing the minions to try to to connect to a master IPC socket which could not be found.

This put the minions into a continual futex state which was not playing well with kill sigs.

* Lint
 2016-09-08 13:03:12 -06:00
Erik Johnson
abe398271b Use string.ascii_lowercase (#36163) 
This is less error-prone than defining a string with all lowercase
letters.

This also uses a tuple for the join as the tuple is a lighter-weight
type and performs the join almost twice as fast as when this is done
with a list, as can be seen below:

>>> import timeit
>>> list_timer = timeit.Timer('":".join(["foo", "bar"])')
>>> tuple_timer = timeit.Timer('":".join(("foo", "bar"))')
>>> list_timer.repeat()
[0.18616199493408203, 0.14670491218566895, 0.14609003067016602]
>>> tuple_timer.repeat()
[0.10539507865905762, 0.08876705169677734, 0.08883404731750488]
>>>
 2016-09-08 13:02:21 -06:00
Pablo Suárez Hernández
235d6308a4 Fixing unit tests for develop (#36141) 
* Fixing skipped boto tests to prevent errors if boto3 does not exists.

* Fix tests to prevent errors when libcloud is not present

* Fix PortageConfigTestCase in case of portage is not present
 2016-09-08 11:15:41 -06:00
Jacob Hammons
4ccf8a841f Merge pull request #36161 from jacobhammons/relnotes 
Adds #36055 to release notes
 2016-09-08 11:11:36 -06:00
Jacob Hammons
ecb0979be7 Adds #36055 to release notes 2016-09-08 11:10:56 -06:00
rallytime
7f955bda0a Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/unit/modules/boto_vpc_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/modules/puppet_test.py
 2016-09-08 10:55:57 -06:00
Nicole Thomas
c49d363c3f Pylint fix for #36072 (#36155) 
Refs #36072
 2016-09-08 10:19:44 -06:00
Tom Williams
52b9729635 INFRA-3943 - Bug fix - too many volumes getting tagged (#36072) 
* INFRA-3943 - Bug fix - too many volumes getting tagged

* INFRA-3943 - Wrong indentation on ret['changes'] update

* INFRA-3943 - shut up pylint about perfectly valid python
 2016-09-08 10:17:15 -06:00
David Wittman
7acab9053f Remove unclosed backticks in walkthrough doc (#36154) 2016-09-08 09:48:16 -06:00
Mike Place
6242702288 Fix issue with cp.push (#36136) 
Incorrect handling of os.path.splitdrive()
 2016-09-08 09:27:28 -06:00
Denys Havrysh
0e13118f6e Document owner kwarg for postgres_schema.present state function (#36147) 2016-09-08 09:25:11 -06:00
Nasenbaer
4105ba6e30 Ignore states that do not have a numeric jid, i.e. 'req' 2016-09-08 16:47:21 +02:00
Mike Place
0b35b91caa Merge pull request #36092 from UtahDave/fix_pwd_stacktrace 
don't stacktrace on import pwd on Windows
 2016-09-08 22:26:00 +09:00
Mike Place
c4e54c853d Merge pull request #36125 from rallytime/test-35172 
Add some unit tests for the jid_queue functionality in minion.py
 2016-09-08 22:23:32 +09:00
Mike Place
0648a7f417 Merge pull request #36132 from UtahDave/carbon_grains_test 
add windows core grain test
 2016-09-08 22:21:43 +09:00
Mike Place
1f909038f0 Merge pull request #36139 from meaksh/tests-fixes-for-2016.3 
Fixing unit tests for 2016.3
 2016-09-08 22:20:21 +09:00
Mike Place
3eb3df55ad Merge pull request #36143 from multani/fix-doc-state-mount 
doc: fix doc formatting for salt.states.mount
 2016-09-08 22:11:03 +09:00
Mike Place
4cc8ea9577 Merge pull request #36146 from meaksh/tests-fixes-for-2015.8 
Fixing unit tests for 2015.8
 2016-09-08 22:10:36 +09:00
Pablo Suárez Hernández
52a7ed605e Fixed _interfaces_ifconfig output for SunOS test 2016-09-08 12:39:28 +01:00
Eric Radman
158bcbff65 Fix tests that assert CommandExecutionError (#32485) 
Trying to assert that an exception was raised using
helper_open.write.assertRaises() is bogus--there is no such method. Use
standard unittest.assertRaises() instead.
 2016-09-08 12:39:28 +01:00
Mihai Dincă
8b480167e1 Fix tests (#35693) 
* Fix tests/unit/modules/useradd_test.py::UserAddTestCase::test_info

* Fix unit/pyobjects_test.py::MapTests::test_map

* Fix tests/unit/pyobjects_test.py::RendererTests::test_extend

* Fix tests/unit/pyobjects_test.py::RendererTests::test_requisite_implicit_list
 2016-09-08 12:39:28 +01:00
Eric Radman
29814f9d43 Skip utils_test if timelib is not installed (#32699) 
date_cast() throws a RuntimeError, not an ImportError
 2016-09-08 12:39:28 +01:00
Pablo Suárez Hernández
d1d806f893 Fix PortageConfigTestCase in case of portage is not present 2016-09-08 12:39:28 +01:00
Pablo Suárez Hernández
1c260e4bd0 Fix tests to prevent errors when libcloud is not present 2016-09-08 12:39:28 +01:00
twangboy
9f9aa4779c rename darwin_sysctl.py to mac_sysctl.py 2016-09-08 12:28:18 +01:00
abednarik
2cf6f36d89 modules.darwin_sysctl: __virtual__ return err msg. 
Updated message in darwin_sysctl module when return False if OS is not OSX.
 2016-09-08 12:28:12 +01:00
Mike Place
f74ca15f50 Remove test for file dir behavior 
Refs #34809
 2016-09-08 11:36:17 +01:00
Eric Radman
c65aefee20 Fix tests that assert CommandExecutionError (#32485) 
Trying to assert that an exception was raised using
helper_open.write.assertRaises() is bogus--there is no such method. Use
standard unittest.assertRaises() instead.
 2016-09-08 11:36:17 +01:00
twangboy
f8c0b439b8 Fixed more lint 2016-09-08 11:36:17 +01:00
twangboy
63ff731009 Fixed tests 2016-09-08 11:36:17 +01:00
Dmitry Kuzmenko
04b1a4a9ca Fixed use of assert_has_calls in tests. 
The method logic was changed in mock-1.1.0.
This mades the use of the method compatible with both <1.1.0 and >=1.1.0
 2016-09-08 11:36:17 +01:00
Dmitry Kuzmenko
46e4bb58e5 Fixed LoadAuthTestCase 2016-09-08 11:36:17 +01:00
rallytime
4e9733ad6d Rename dockerio.py unit tests to dockerio_test.py 
These tests have never run automatically because of an incorrect file name.

Added a skipIf on these tests as they are currently non-functioning and the
module they're testing has been deprecated.
 2016-09-08 11:36:17 +01:00
Pedro Algarvio
ec0cc943e0 Make sure spm tests are picked up by runtests. 
Lists in py2 don't have the clear method
 2016-09-08 11:36:17 +01:00
kstreee
2605f34849 Fix missing first data in stream when subscribing stream using a function 'read_async'. 2016-09-08 11:36:17 +01:00
Pablo Suárez Hernández
305bab8be0 Fixed _interfaces_ifconfig output for SunOS test 2016-09-08 11:36:17 +01:00
Eric Radman
b5ca02c867 Fix tests that assert CommandExecutionError (#32485) 
Trying to assert that an exception was raised using
helper_open.write.assertRaises() is bogus--there is no such method. Use
standard unittest.assertRaises() instead.
 2016-09-08 11:36:17 +01:00