Pedro Algarvio
0bc44131e8
Py3 compatibility fixes
2015-01-30 22:25:04 +00:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
Colton Myers
c4da7bdd64
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/client/mixins.py
salt/daemons/flo/__init__.py
2015-01-26 19:44:59 -07:00
Pedro Algarvio
a6c3915049
Fix order for proper diff on failure
2015-01-24 03:16:51 +00:00
rallytime
d724ed3a47
Merge branch '2015.2' into 'develop'
...
Conflicts:
salt/cli/batch.py
salt/cloud/clouds/msazure.py
tests/integration/netapi/rest_tornado/test_app.py
2015-01-16 11:36:32 -07:00
Erik Johnson
175ba127be
Merge branch '2014.7' into 2014.7-2015.2
...
Conflicts:
salt/modules/archive.py
2015-01-14 14:26:22 -06:00
Mike Place
c172470c30
Try giving some rest tornado requests a little more time
2015-01-13 14:17:55 -07:00
Mike Place
74501f56ae
Fix tornado tests
...
The tornado test runner isn't respecting timeouts as it claims it
should in async mode. However, the env variable is working as-described.
2015-01-12 15:36:34 -07:00
Thomas Jackson
925afac98d
Temporarily change this test to work around race condition in the runnerclient
...
@rallytime If you have some list of tests that are disabled that shouldn't be, this is one for the list :)
2015-01-10 00:18:16 -08:00
Mike Place
d6ce858c23
Try giving some rest tornado requests a little more time
2015-01-08 10:04:19 -07:00
Thomas S Hatch
d416b8b1b8
gix tornado merge conflict
2014-11-26 09:25:47 -07:00
Thomas S Hatch
6aa5b0f858
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/genesis.py
salt/modules/parted.py
salt/modules/win_service.py
salt/runner.py
salt/states/file.py
tests/integration/netapi/rest_tornado/test_app.py
2014-11-26 09:24:24 -07:00
rallytime
eeab98c3be
Skip tornado tests if we can't import ZMQIOLoop
...
Tornado tests were failing on Ubuntu 10 and 12 because they don't have
a new enough version of PyZMQ to use the ioloop.current function.
2014-11-25 13:06:33 -07:00
Colton Myers
dc43840cee
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/modules/glusterfs.py
salt/modules/macports.py
salt/modules/makeconf.py
salt/modules/mdadm.py
salt/modules/smartos_vmadm.py
salt/modules/zypper.py
salt/utils/event.py
tests/integration/netapi/rest_tornado/test_app.py
tests/unit/netapi/rest_tornado/test_handlers.py
2014-11-21 12:05:32 -07:00
Thomas Jackson
0a1b88e6b5
Change all saltnado asserts to unittest asserts. This way when there is a failure you get nice pretty printouts!
2014-11-20 18:35:41 -08:00
Pedro Algarvio
0c50d789b7
The imports actually work so shut up PyLint!
2014-11-20 18:22:19 +00:00
Pedro Algarvio
10a9c479ff
Remove unused import
2014-11-20 16:45:36 +00:00
Pedro Algarvio
5cf320f45f
Allow the tests to be skipped
2014-11-20 16:40:47 +00:00
Pedro Algarvio
e45033b993
Make PyLint ignore unused imports
2014-11-20 16:40:47 +00:00
Pedro Algarvio
6b19c7b03e
Use urlencode from six
2014-11-20 16:40:45 +00:00
Colton Myers
716a7e3331
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/modules/bsd_shadow.py
salt/modules/freebsdjail.py
salt/modules/yumpkg.py
salt/modules/zfs.py
salt/modules/zypper.py
salt/netapi/rest_tornado/saltnado.py
salt/states/dockerio.py
2014-11-18 12:46:29 -07:00
Thomas Jackson
837a8ed475
Move EventListener over to ZMQStreams
2014-11-17 08:24:28 -08:00
Thomas Jackson
f7adfb44e9
Increase timeout from 5s to 10s, since jenkins seems to have issues calling runners in 5s
2014-11-14 18:08:44 -08:00
Thomas Jackson
ea8b4bb479
Make sure to only cleanup the tag_map in the case that you timeout the future
2014-11-14 11:47:35 -08:00
Thomas Jackson
e2102fcbc7
Pylint cleanup
2014-11-14 09:15:54 -08:00
Thomas Jackson
6f0552c9e1
Pylint fixes
2014-11-13 09:33:14 -08:00
Thomas Jackson
9e61037b0d
Cleanup, and fix exp_form override-- we need to do it after the ping to minions
2014-11-13 08:36:28 -08:00
Thomas Jackson
ce22427071
Remove timeout test since that no longer valid
2014-11-13 08:36:28 -08:00
Thomas Jackson
31b54762b0
Add tests for multi-post and multi-token
2014-11-13 08:36:28 -08:00
Thomas Jackson
a259f2149b
Move syndic_wait_done into base class (more than one func need it)
...
Change local_batch to just call local to get the minion list
2014-11-13 08:36:28 -08:00
Thomas Jackson
522090a8c8
Rework local to ping minions, and wait a min of syndic_wait (if a syndic)
2014-11-13 08:36:28 -08:00
Thomas Jackson
9d4784f835
Update todo marker
2014-11-13 08:36:28 -08:00
Thomas Jackson
8cd7b06b36
Change disbatch to handle different clients per lowstate chunk
2014-11-13 08:36:27 -08:00
Thomas Jackson
1131522eb5
Update TODO marker
2014-11-13 08:36:27 -08:00
Thomas Jackson
b99e189468
Add tests for WebhookSaltAPIHandler
2014-11-13 08:36:27 -08:00
Thomas Jackson
2d9b1df95d
Add tests for EventsSaltAPIHandler
2014-11-13 08:36:27 -08:00
Thomas Jackson
847df0fad6
Add RunSaltAPIHandler tests
2014-11-13 08:36:27 -08:00
Thomas Jackson
bd58ca8fa0
Add Jobs api endpoint tests
2014-11-13 08:36:27 -08:00
Thomas Jackson
f0f9b14ee2
Add tests for MinionSaltAPIHandler
2014-11-13 08:36:27 -08:00
Thomas Jackson
cd01c9a1d6
Add check for the redirect location
2014-11-13 08:36:27 -08:00
Thomas Jackson
8bd72aeb4f
Add test for unauthorized access
2014-11-13 08:36:27 -08:00
Thomas Jackson
7ef2537842
Finished basic tests for base SaltAPIHandler
2014-11-13 08:36:27 -08:00
Justin Findlay
b097a1e16b
pre-emptive pylint fix0r
2014-11-11 15:22:40 -07:00
Justin Findlay
abb3ba87bf
integration test: known JID through netapi #15763
2014-11-11 15:15:36 -07:00
rallytime
96a1288808
Add minions_denied to netapi test
2014-10-14 16:49:07 -06:00
Pedro Algarvio
8e93faa072
Fix lint errors
2014-10-08 01:02:11 +01:00
Pedro Algarvio
5e4eb4bbaf
Don't add tests in __init__
2014-10-08 01:02:10 +01:00
Seth House
2b5bed43b9
Add integration test for logging out of the rest_cherrypy app
2014-08-15 09:45:30 -04:00
Seth House
c046f1cac7
Revert "Switch NetapiClient to use client_config instead of master_config"
...
This partially reverts commit 2bc1ed8afb
2014-07-25 14:42:19 -06:00
Seth House
2bc1ed8afb
Switch NetapiClient to use client_config instead of master_config
...
We access the Salt master through client interfaces and should use the
correct config when doing so. We should also reuse the already-loaded
opts when instantiating LocalClient().
2014-07-24 16:08:31 -06:00
