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
67,775 Commits 24 Branches 182 Tags 341 MiB
298e0453b8
Commit Graph

6788 Commits

Author SHA1 Message Date
Nicole Thomas
9216e303e1 Merge pull request #31961 from kraney/kraney_bugfix 
Make sure there are no connection object cache hits on boto_* unit te…
 2016-03-22 14:38:46 -06:00
Andreas Lutro
46018e4535 update kapacitor tests 2016-03-22 15:10:46 +01:00
Kris Raney
b4889024c5 Merge branch 'develop' into kraney_bugfix 2016-03-22 09:05:58 -05:00
Dmitry Kuzmenko
88e8106b00 Handle -c option in minionswarm script. 
There is a '-c' option that says: pass in an alt. conf. dir.
But this option isn't used in the minionswarm. I found it very useful to
use it to specify a path to the base salt configuration that would be
updated with the minionswarm specific needs (different ports, paths
etc.) keeping other parameters like alive intervals, timeouts, mine
options and so on.
 2016-03-21 16:13:43 +03:00
rallytime
37dee42061 Pylint fixes 2016-03-18 16:27:06 -06:00
rallytime
52111eb01a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/cloud/clouds/joyent.py
  - salt/minion.py
 2016-03-18 16:00:35 -06:00
rallytime
4768bfafc6 Disable boto tests that are failing on develop 2016-03-18 14:02:06 -06:00
rallytime
a110b4d55d Don't overwrite previously mocked grains 2016-03-18 13:29:08 -06:00
rallytime
b2f3cc080f Disable more boto test classes that kill the test suite 2016-03-18 13:04:34 -06:00
rallytime
fa4650523e Pylint fixes 2016-03-18 12:21:09 -06:00
rallytime
6360ecd3b3 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/clouds/scaleway.py
  - salt/config/__init__.py
  - salt/log/mixins.py
  - salt/minion.py
  - salt/modules/ps.py
  - salt/utils/decorators/__init__.py
  - salt/utils/schema.py
  - tests/unit/modules/etcd_mod_test.py
  - tests/unit/modules/file_test.py
 2016-03-18 11:26:12 -06:00
rallytime
308aa5fd61 Merge branch '2016.3' into 'develop' 
Conflicts:
  - conf/master
  - conf/minion
  - doc/ref/proxy/all/index.rst
  - salt/cli/daemons.py
  - salt/modules/key.py
  - salt/modules/reg.py
  - salt/modules/win_pkg.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py
  - tests/unit/daemons_test.py
 2016-03-18 10:57:15 -06:00
Nicole Thomas
00f5fedf53 Merge pull request #31955 from jtand/merge-31926-with-fixes 
Disable some boto tests causing issues in the test suite on 2016.3
 2016-03-18 09:50:37 -06:00
Kris Raney
890648aca0 Make sure there are no connection object cache hits on boto_* unit tests. 2016-03-17 15:07:43 -05:00
Justin Anderson
ef2db9a301 Skipping some boto tests that are broken 2016-03-17 11:05:43 -06:00
Nicole Thomas
fb6d5fa44b Merge pull request #31946 from rallytime/merge-31886 
Fix pylint for #31886
 2016-03-17 09:45:10 -06:00
rallytime
98267ca100 Fix pylint for #31886 
Merges #31886
 2016-03-17 09:01:59 -06:00
Ch3LL
b761059405 add absolute_import 2016-03-16 20:58:41 -06:00
Pedro Algarvio
cb196803fd
Skip boto tests which are pegging CPU and eating all available RAM. 2016-03-17 01:01:24 +00:00
Pedro Algarvio
2fcc916c6a
Make sure all started processed, at least and as a last resort, are killed. 2016-03-16 19:40:49 +00:00
Pedro Algarvio
e1281e34cc
Don't assume the tests suite is running as root 2016-03-16 19:40:49 +00:00
Pedro Algarvio
916b6b402d
Skip tests if urllib3 is not installed 2016-03-16 19:40:48 +00:00
Ch3LL
5bcc5b2f21 fix pylint and remove super() 2016-03-16 11:44:55 -06:00
Nicole Thomas
03e8b72655 Merge pull request #31904 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-03-16 11:23:54 -06:00
Mike Place
854d34aa30 Merge pull request #31626 from isbm/isbm-md5-to-sha1-dev 
Use SHA256 instead of MD5 (develop branch)
 2016-03-16 10:14:28 -06:00
Mike Place
b068eaa963 Merge pull request #31745 from isbm/isbm-always-minion-errcode-2-fix 
Fix the always-false behavior on checking state
 2016-03-15 17:02:19 -06:00
rallytime
892591a39c More pylint fixes 2016-03-15 15:50:05 -06:00
rallytime
35b2076584 Pylint fixes 2016-03-15 14:55:35 -06:00
rallytime
85e5acd11a Merge #31903 with pylint fix 
Merges #31903
 2016-03-15 14:05:09 -06:00
Mike Place
c28fc6e1d8 Merge pull request #31893 from Unity-Technologies/hotfix/windows-proxy-enable 
Hotfix/windows proxy enable
 2016-03-15 12:58:33 -06:00
Daniel Hobley
415cc8efab Make sure we enable the proxy settings on windows 2016-03-15 12:02:12 +01:00
Erik Johnson
394410e2b0 Add integration test for depends decorator 2016-03-14 22:16:10 -05:00
Mike Place
8e540af197 Remove useless mine tests 
These are so heavily mocked that they test nothing.
 2016-03-14 11:35:42 -06:00
Daniel Hobley
55f7ab1fba Fixed a bug where a cert was not correctly updated 
If the certificate supplied had a different hash than the previous but the name was the same the change was ignored, this commit fixes that.
 2016-03-11 11:52:15 -06:00
Nicole Thomas
cce0af9a2e Merge pull request #31792 from kraney/boto_elasticsearch 
Add boto_elasticsearch_domain module
 2016-03-11 08:57:27 -07:00
Christophe Drevet-Droguet
dcd6f5a5a9 test for file.apply_template_on_contents 2016-03-11 12:44:26 +01:00
Kris Raney
b0f0601bfc More pylint fun 2016-03-10 21:02:06 -06:00
Kris Raney
3bcca37d80 Ah, pylint. Equal parts useful and annoying. 2016-03-10 20:57:03 -06:00
Ch3LL
3c03d9bd57 add mac_defaults test 2016-03-10 16:34:18 -07:00
Kris Raney
70b9860b1a Fix pylint, doctstring, and tests in the case that boto3 is not installed 2016-03-10 17:09:52 -06:00
Kris Raney
15675c78c8 Add boto3 requirement to boto_vpc unit tests 2016-03-10 17:03:10 -06:00
Kris Raney
4161a7e789 Merge branch 'develop' into boto_vpc 2016-03-10 17:02:08 -06:00
rallytime
fe7ff0ebfa Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/__init__.py
  - salt/returners/smtp_return.py
 2016-03-10 13:13:35 -07:00
Nicole Thomas
75dfb2ed40 Merge pull request #31797 from Ch3LL/fix_pkginfo_test 
Change pkg name to less for suse pkg.info_installed test
 2016-03-10 12:08:16 -07:00
Ch3LL
910f0d9ffc change pkg name to less for suse 2016-03-10 11:18:44 -07:00
Nicole Thomas
4e0b44a1bb Merge pull request #31795 from rallytime/lint-31761 
Merge #31761 with lint fix
 2016-03-10 11:01:25 -07:00
Justin Findlay
e46bac2d98 transport.tcp unit tests: disable hanging tests 2016-03-10 10:57:21 -07:00
Justin Findlay
992a8af726 renderers.gpg unit tests: mock gpg command 2016-03-10 10:57:21 -07:00
Justin Findlay
e0abe23c7e states.ssh int tests: run both test cases manually 2016-03-10 10:57:21 -07:00
Justin Findlay
d33b365984 states.pkg int tests: add pkgs for MacOS 2016-03-10 10:57:21 -07:00