Thomas S Hatch
b626149245
fix tests
2015-04-15 11:59:25 -06:00
Thomas S Hatch
79e09616ae
Merge pull request #22680 from rallytime/moar_pylint
...
Pylint fix for develop
2015-04-14 19:39:09 -06:00
rallytime
3cc8788f7b
Pylint fix for develop
2015-04-14 15:54:38 -06:00
Matthew Williams
8fa76d7e40
lint on boto_vpc_test
2015-04-14 20:16:30 +00:00
Matthew Williams
46bde83216
Merge remote-tracking branch 'origin/develop' into boto_utils
...
Conflicts:
salt/modules/boto_ec2.py
2015-04-14 20:07:57 +00:00
Mike Place
c324e568aa
Fix broken salt-tcpdump
2015-04-14 13:35:16 -06:00
rallytime
63c3ada4fd
Python 3 Compat for new transport files
2015-04-14 09:16:42 -06:00
Thomas Jackson
435fc7ba61
Add some support pyzmq 13.0.x
...
pyzmq 13.0.x was the first version to support *any* tornado in pyzmq, and since 14.0.x they have changed the API (IMO into a more sensible one). This conditionally changes the name to match the new API's naming
2015-04-13 17:43:45 -07:00
Matthew Williams
b8ead7ab27
utils.boto get_exception -> class
2015-04-13 22:34:19 +00:00
Justin Findlay
3226c6ccb4
further saltnado lint
2015-04-13 16:28:10 -06:00
Thomas Jackson
3f1558b5d2
No reason to implement get_app in the mixin
2015-04-13 16:28:10 -06:00
Thomas Jackson
16bc3d0731
Pylint fixup
2015-04-13 16:28:10 -06:00
Matthew Williams
66f3c413e3
fix boto_ tests for use with utils.boto
2015-04-13 22:04:00 +00:00
Matthew Williams
1c9a01bd4f
Merge remote-tracking branch 'origin/develop' into boto_utils
2015-04-13 18:10:38 +00:00
Matthew Williams
4959bf4e1a
modules.boto_vpc use utils get_conn and cache_id
2015-04-13 18:07:15 +00:00
Nicole Thomas
dcfe4cca7b
Merge pull request #22591 from mgwilliams/boto_utils
...
utils.boto: convenience partials
2015-04-13 11:59:23 -06:00
Thomas S Hatch
2d9b6eb1e0
Merge pull request #22545 from dmyerscough/digital-ocean-v2-tests
...
Digital Ocean APIv2 Integration Testing
2015-04-13 11:17:20 -06:00
Matthew Williams
45b118f93a
Merge remote-tracking branch 'origin/develop' into boto_utils
2015-04-13 15:43:01 +00:00
Matthew Williams
b3ec570499
utils.boto: add convenience partials
2015-04-13 15:42:32 +00:00
Mike Place
6a11ead5b4
Merge pull request #22453 from jacksontj/transport
...
Abstracted Transport
2015-04-13 09:38:52 -06:00
Colton Myers
5b6d410119
Fix calltest
2015-04-11 15:59:06 -04:00
Colton Myers
99744b9568
Fix lint
2015-04-11 15:56:09 -04:00
Colton Myers
cc8785e980
Fix the test.fib tests
2015-04-11 14:48:59 -04:00
Damian Myerscough
f51fd0349a
Fix pylint error
2015-04-10 23:16:20 -07:00
Damian Myerscough
c6e618bc5f
Digital Ocean APIv2 Integration Testing
2015-04-10 21:30:09 -07:00
Thomas S Hatch
02d6c52bf3
Merge pull request #22508 from semarj/add-disable-webhook-auth
...
allow disabling auth on webhook endpoint in rest_tornado
2015-04-10 14:26:09 -06:00
Joshua Semar
46a25b5c58
missed switch to build_tornado
2015-04-10 16:40:42 +00:00
Thomas Jackson
66016ed132
pylint
2015-04-10 09:40:26 -07:00
Thomas Jackson
8ff37b34b8
Check for FDs attached to the IOLoops after test runs
2015-04-10 09:40:26 -07:00
Joshua Semar
d9ed9f1e5b
fix linting errors
2015-04-10 16:35:07 +00:00
Thomas S Hatch
71e14cb4d8
Merge pull request #22469 from mgwilliams/boto_utils
...
boto utils module
2015-04-10 09:14:20 -06:00
Joshua Semar
c56845e904
include mod_opts on tornado application, refactor get_app
2015-04-10 15:06:30 +00:00
Pedro Algarvio
0651c06ec0
Fix import
2015-04-10 00:04:17 +01:00
Matthew Williams
4976f863f9
utils.boto unit test -- use utf-8 encoding
2015-04-08 19:39:55 +00:00
Pedro Algarvio
35b3cdcc82
Get the first iteration the right way
...
Fixes `TypeError: 'dictionary-valueiterator' object has no attribute '__getitem__'`
2015-04-08 19:43:55 +01:00
Thomas Jackson
ce850a3e33
pylint cleanup
2015-04-08 08:20:17 -07:00
Thomas Jackson
f07840fb12
pylint cleanup
2015-04-08 08:20:03 -07:00
Thomas Jackson
6a34d1dd3f
Remove AES key initing-- since we are mocking out _send_pub
2015-04-08 08:19:03 -07:00
Matthew Williams
d642b5bc89
utils.boto: fix missing import and add regression test
2015-04-08 15:12:15 +00:00
Thomas Jackson
10ec3343ae
pylint cleanup
2015-04-08 08:10:52 -07:00
Thomas Jackson
2683843bdf
pylint cleanup
2015-04-08 08:04:45 -07:00
Thomas Jackson
cc06dd620d
Pylint
2015-04-08 08:04:02 -07:00
Matthew Williams
28f3e5d0ad
utils.boto: add get_exception
2015-04-08 14:46:28 +00:00
Thomas Jackson
348118ff6d
Mock/stub out _send_pub in ClearFuncs
...
Before we were attempting to serialize a MagicMock object
2015-04-07 21:36:13 -07:00
Thomas Jackson
bf97e8c16f
Make sure to close server processes after each test.
...
Waiting for the destructor doesn't necessarily work, since its not gauranteed to run immediately.
2015-04-07 21:25:53 -07:00
Thomas Jackson
f5e2650227
Add basic tests for asyncEventpublisher
2015-04-07 21:01:43 -07:00
Thomas Jackson
cb02d0e021
Remove "close()" api-- just use a destructor
2015-04-07 21:01:43 -07:00
Thomas Jackson
d21e180a5a
Fix race condition in integration test startup
2015-04-07 21:01:43 -07:00
Thomas Jackson
d87c62b453
Make transport unit tests pull configs from test suite instead of from /etc/salt
2015-04-07 21:01:42 -07:00
Thomas Jackson
e17824a0b1
Change _handle_payload to return a future.
...
This means we can make more and more of the core async (using coroutines) without having to change the transport modules-- as they all already expect futures.
2015-04-07 21:01:15 -07:00
