rallytime
6479a22c1d
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/modules/napalm_network.py
2016-11-18 07:50:16 -07:00
rallytime
d5a7ef6ca8
Merge branch '2016.3' into '2016.11'
...
No conflicts.
2016-11-17 10:37:42 -07:00
Mike Place
3be9ab4cd0
Warn on AES test for systems with > 1 core ( #37724 )
...
* Warn on AES test for systems with > 1 core
* Whitespace fix
2016-11-16 09:44:33 -07:00
Alexandru Bleotu
1a96f11269
Increased timeout to test_badload zeromq test
2016-10-26 08:04:42 -04:00
Mike Place
0aab883180
Merge branch '2016.3' into 3_carbon
2016-10-25 16:13:44 +09:00
Mike Place
c4393d5e9e
Address transport test hang
...
It would appear that if an attribute error is raised when trying to detect a class atter,
that the test suite does not run the class teardown method but continues regardless. This
fixes the class attr error which then allows the teardown to run. Prior to this, if the
teardown did not run, the entire suite would hang out shutdown because it was blocked
on waiting for a ioloop to terminate.
2016-10-25 13:16:35 +09:00
rallytime
063ddfd7ce
Merge branch '2016.3' into 'carbon'
...
No conflicts.
2016-10-24 10:16:17 -06:00
Nicole Thomas
d7e28d24a4
Pylint fix for 2016.3 ( #37186 )
...
Refs #37175
2016-10-24 09:42:41 -06:00
rallytime
027e2212c9
Merge branch '2016.3' into 'carbon'
...
Conflicts:
- salt/modules/status.py
- salt/modules/win_status.py
- salt/modules/zypper.py
- salt/utils/network.py
- tests/unit/transport/zeromq_test.py
2016-10-24 09:29:53 -06:00
Mike Place
0fecb5ff2e
Remove sleep. Thanks @s0undt3ch
2016-10-24 18:38:49 +09:00
Mike Place
cedc609503
Fix test suite hang on salt testing
...
We don't need to clean up here since the test suite will handle it for us.
2016-10-24 15:52:33 +09:00
Pedro Algarvio
a0d47fac40
Don't run routines if _handle_payload is not present
2016-08-22 00:36:53 +01:00
rallytime
7b0ad25b09
Remove iteritems() references from unit/transport/*.py files
2016-07-19 10:22:33 -06:00
Justin Anderson
28ba98c613
Skip some tests related to #32902 ( #32995 )
2016-05-03 08:55:23 -07:00
justinta89
fd0dedeb99
Skipping Async tests
...
Skipping the transport async tests until we can devote more time to fixing the
test failures associated with them.
2015-09-24 13:41:58 -06:00
Mike Place
57b78d369a
Make the testing ioloop the current one
...
Otherwise, loops from previous intefere and cause stacktraces on ioloop init
2015-09-03 13:28:28 -06:00
Mike Place
69b9f1781c
Revert zmq test experiment
2015-06-30 14:38:31 -06:00
Mike Place
8a5caf02c2
Change pub test to return global ioloop instance
...
This *could* be causing the intermetent failures on
unit.transport.zeromq_test.AsyncPubChannelTest.test_basic but it
is a bit of a shot in the dark.
2015-06-30 13:37:03 -06:00
Mike Place
72752f53ff
Fix failing zmq tests
...
This is just a stopgap to prevent the ioloop from shutting down before the procs die off.
2015-06-18 11:45:57 -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
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
Thomas Jackson
2683843bdf
pylint cleanup
2015-04-08 08:04:45 -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
Thomas Jackson
98842a86da
Fix zmq pub channels
2015-04-07 20:53:29 -07:00
Thomas Jackson
b1ca45dcee
Refactor pub tests
2015-04-07 20:53:27 -07:00
Thomas Jackson
2ce0582991
Add unregister tests
2015-04-07 20:53:27 -07:00
Thomas Jackson
9ec426bdb2
Add basic Asyncpubchannel tests to zmq
2015-04-07 20:53:27 -07:00
Thomas Jackson
1a88eeeed4
Add basic Pub channel tests
2015-04-07 20:53:26 -07:00
Thomas Jackson
d619dfbf96
Add initial req_channel tests
2015-04-07 20:53:26 -07:00
