rallytime
|
f603757b55
|
Merge branch '2015.8' into '2016.3'
Conflicts:
- tests/unit/modules/mount_test.py
- tests/unit/states/file_test.py
|
2016-09-13 08:21:48 -06:00 |
|
Pablo Suárez Hernández
|
fdf40907b7
|
Some unit tests fixes (#36227)
* Prevent tests failures if boto does not exists
* Prevent tests failure if /etc/fstab does not exists
|
2016-09-12 11:43:12 -06:00 |
|
rallytime
|
c12b9a5094
|
Merge branch '2015.8' into '2016.3'
No conflicts.
|
2016-05-02 10:50:27 -06:00 |
|
Justin Anderson
|
00fbeaba5f
|
Fix boto_secgroup_test (#32986)
|
2016-05-02 10:46:19 -06:00 |
|
Colton Myers
|
076b49a4ca
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3
Conflicts:
README.rst
doc/conf.py
doc/ref/index.rst
doc/ref/proxy/all/salt.proxy.ssh_sample.rst
doc/topics/installation/rhel.rst
doc/topics/releases/2015.8.4.rst
doc/topics/tutorials/states_pt5.rst
salt/cloud/clouds/ec2.py
salt/cloud/clouds/opennebula.py
salt/config/__init__.py
salt/modules/boto_dynamodb.py
salt/modules/boto_ec2.py
salt/modules/boto_elasticache.py
salt/modules/boto_elb.py
salt/modules/boto_iam.py
salt/modules/boto_rds.py
salt/modules/boto_sns.py
salt/modules/boto_sqs.py
salt/modules/dracr.py
salt/modules/git.py
salt/modules/mine.py
salt/modules/systemd.py
salt/modules/win_pkg.py
salt/modules/yumpkg.py
salt/pillar/__init__.py
salt/states/git.py
salt/states/rabbitmq_vhost.py
salt/states/saltmod.py
salt/utils/pkg/rpm.py
setup.py
tests/unit/modules/systemd_test.py
tests/unit/states/rabbitmq_vhost_test.py
|
2016-02-11 22:33:49 -07:00 |
|
Mike Place
|
c73b5a4a66
|
Fix boto_secgroup
|
2016-02-09 11:52:15 -07:00 |
|
Ethan Moore
|
c7aea90546
|
Adding tags to OrderedDict in test module
Adding SaltInvocationError import
|
2015-10-02 20:10:07 +00:00 |
|
Robert McLeay
|
57067a3c0f
|
Fixing linting in boto_secgroup module and unit test.
|
2015-05-04 15:45:26 +10:00 |
|
Robert McLeay
|
c2695986fe
|
Added rules_egress to boto_secgroup unit test.
|
2015-05-04 15:45:25 +10:00 |
|
Matthew Williams
|
66f3c413e3
|
fix boto_ tests for use with utils.boto
|
2015-04-13 22:04:00 +00:00 |
|
rallytime
|
0e57d8fe6e
|
Fix pylint errors on develop
|
2015-02-23 12:24:53 -07:00 |
|
Chris Rebert
|
ea02ef58b7
|
re-enable pylint instead of disabling it twice
|
2015-02-20 23:50:30 -08:00 |
|
Pedro Algarvio
|
de4a9fefa4
|
Py3 compatibility fixes
|
2015-01-30 22:25:12 +00:00 |
|
Pedro Algarvio
|
60f215f191
|
Add from __future__ import absolute_import
|
2015-01-30 22:25:04 +00:00 |
|
Pedro Algarvio
|
8a1cc589a1
|
Disable some Pylint errors
|
2014-11-28 15:31:01 +00: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 |
|
rallytime
|
2285a10a95
|
Use salt.utils.odict instead of python2.7 OrderedDict
|
2014-08-20 09:24:52 -06: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 |
|
Colin Johnson
|
86bcea16ee
|
resolve issue with boto < 2.4.0 GroupOrCIDR attributes
|
2014-08-15 18:58:26 +00:00 |
|
Colin Johnson
|
41c51b4044
|
resolve issue with Ubuntu 12.0.4 failures
|
2014-08-15 01:12:43 +00: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 |
|