Commit Graph

13 Commits

Author SHA1 Message Date
Eric Radman
42222b06fe Remove stray debug print statements (#35019)
This cleans up the unit test output a bit, mostly leaving deprecation warnings.
2016-07-28 09:17:27 -06:00
Stephen Woodrow
c695a57ba9 Fix tests. 2015-11-24 18:09:12 -08:00
Stephen Woodrow
509ded1bd0 Fix some tests. 2015-10-05 20:57:17 -07:00
rallytime
cae2c4e715 Syntax fix 2015-09-29 10:02:16 -06:00
rallytime
458547ba03 Fix test failures for boto __state__ changes 2015-09-29 09:55:44 -06:00
Colton Myers
d3d0e004d9 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/keystone.py
    salt/modules/pw_user.py
    salt/states/reg.py
    setup.py
2015-08-17 16:54:16 -06:00
rallytime
211f6feaf5 Fix test failures - get_attributes shouldn't be called if none are provided 2015-08-17 10:58:44 -06:00
Colton Myers
c4f5e231fa Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2
Conflicts:
    doc/_themes/saltstack2/layout.html
    doc/conf.py
    doc/index.rst
    doc/ref/modules/all/salt.modules.hipchat.rst
    doc/topics/releases/index.rst
    salt/client/ssh/client.py
    salt/cloud/clouds/vsphere.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_route53.py
    salt/modules/data.py
    salt/modules/http.py
    salt/modules/tls.py
    salt/output/compact.py
    salt/states/boto_elb.py
    salt/states/linux_acl.py
    salt/states/rabbitmq_user.py
    salt/states/win_servermanager.py
    salt/utils/dictupdate.py
    salt/wheel/config.py
2015-05-29 15:10:13 -06:00
Ryan Lane
d8dc9a7b5b Better unit tests for boto_elb state 2015-05-28 16:52:24 -07:00
Ryan Lane
62f214b535 Remove cnames_present test 2015-05-28 10:21:15 -07:00
Jayesh Kariya
06979ca744 adding states/boto_elb unit test 2015-04-24 12:07:41 -06:00
Jayesh Kariya
d347bb4e3b changes as per 2015.2 branch 2015-04-23 17:58:08 +05:30
Jayesh Kariya
6ef51d1b2d adding states/boto_elb unit test case 2015-04-23 17:29:19 +05:30