Erik Johnson
dfbbeb5946
Fix documentation for docker login function in pre-nitrogen release branches
...
These should be referencing ``dockerng.login``, not ``docker.login``.
2017-04-28 09:32:04 -05:00
Mike Place
909d519ddb
Merge pull request #40751 from rallytime/fix-39531
...
Use Salt's SaltYamlSafeLoader and SafeOrderedDumper classes for yaml.load/dump
2017-04-28 06:56:05 -06:00
Pedro Algarvio
fc90c8ec06
Switch how IOLoop's are run on these tests
2017-04-28 13:36:45 +01:00
Pedro Algarvio
e6ee82e7be
The expected error message is different on py2 and py3
2017-04-28 13:36:45 +01:00
Pedro Algarvio
75c035f09f
Fix basic stats when the test daemons are not running
2017-04-28 13:36:45 +01:00
Pedro Algarvio
e31858c06d
Somehow tornado.ioloop was None during a test run
2017-04-28 13:36:44 +01:00
Pedro Algarvio
d65742c066
Delete attributes
2017-04-28 13:36:44 +01:00
Pedro Algarvio
abe608d739
Drop @patch usage
2017-04-28 13:36:42 +01:00
Pedro Algarvio
4b59c351e4
This branch no longer targets py 2.6
2017-04-28 13:33:37 +01:00
Pedro Algarvio
7b503e562b
Use setUpClass instead of __init__
2017-04-28 13:33:37 +01:00
Pedro Algarvio
0ae04c01ef
Delete all attributes even strings, boolean, integers
2017-04-28 13:33:37 +01:00
Pedro Algarvio
a0da182e0c
Setup console logging
2017-04-28 13:33:37 +01:00
Pedro Algarvio
2c6725d96e
Tell python that we're done with this dictionary
2017-04-28 13:33:37 +01:00
Pedro Algarvio
50629ac1d4
Create a map of log levels to log names.
...
Add temporary logging handler subclasses to better identify which
loggers are used for what.
2017-04-28 13:33:36 +01:00
Pedro Algarvio
9a3f6d1350
Properly handle non native strings under py2 and py3
2017-04-28 13:33:36 +01:00
Pedro Algarvio
5ed3d8d98c
Don't error out because of bad file descriptor errors
2017-04-28 13:33:36 +01:00
Pedro Algarvio
102d63e238
Use self.addCleanup instead
2017-04-28 13:33:36 +01:00
Pedro Algarvio
88627d312f
Write the generated configuration into a config file
2017-04-28 13:33:36 +01:00
Pedro Algarvio
ef3dbb10de
Lint fixes
2017-04-28 13:33:35 +01:00
Pedro Algarvio
9ffc79ca67
Use tornado HTTPClient directly.
2017-04-28 13:33:35 +01:00
Pedro Algarvio
80b80e5416
Fix cherrypy memory leakage
...
* Clean its event/signal bus since our tests don't rely on those.
* No test class level dictionaries
2017-04-28 13:33:35 +01:00
Pedro Algarvio
566fbdd777
Tell python we're done with contents
2017-04-28 13:33:35 +01:00
Pedro Algarvio
5cfa898ad7
No need to create an additional view_keys object under py3
2017-04-28 13:33:35 +01:00
Pedro Algarvio
dfeb3da8dc
Minor cleanup changes
2017-04-28 13:33:34 +01:00
Pedro Algarvio
3bf84e2a4e
Rename classes in order not to be collected up by pytest
2017-04-28 13:33:34 +01:00
Pedro Algarvio
7480a8e5fb
Check status on setUp not on the module level @skipIf decorator
2017-04-28 13:33:34 +01:00
Pedro Algarvio
6eac0ee132
Call tearDown and not setUp
...
@cachedout with this change, the FD's still attached code will always
fail, so, for now, that's just commented out.
When you wrote this, did tornado eventually cleaned these FD's?
2017-04-28 13:33:34 +01:00
Pedro Algarvio
6364128ad3
Fix tornado test cases
2017-04-28 13:33:34 +01:00
Pedro Algarvio
5bbda919c1
Py3 compat
2017-04-28 13:33:33 +01:00
Pedro Algarvio
701280ae18
Cleanup
2017-04-28 13:33:33 +01:00
Pedro Algarvio
46fe7f63a7
Don't hardcode to root
2017-04-28 13:33:33 +01:00
Pedro Algarvio
75569c8e99
unittest.TestCase does not have a skip() method. It's skipTest.
2017-04-28 13:33:33 +01:00
Pedro Algarvio
790b500de7
More informative error message
2017-04-28 13:33:33 +01:00
Pedro Algarvio
46b5820c3b
Py3 compat
2017-04-28 13:33:32 +01:00
Pedro Algarvio
4062bd9fd9
Don't attempt connections at the module level!
2017-04-28 13:33:32 +01:00
Pedro Algarvio
c1a6e6a214
Py3 Compat
2017-04-28 13:33:32 +01:00
Pedro Algarvio
1d8f02f635
Drop @patch usage. Py3 Compat.
2017-04-28 13:33:32 +01:00
Pedro Algarvio
28bf7d91be
Py3 compat
2017-04-28 13:33:32 +01:00
Pedro Algarvio
41df7eca96
Use setUpClass instead of __init__
2017-04-28 13:33:31 +01:00
Mike Place
db35b40b51
Merge pull request #40830 from twangboy/unicode_useradd
...
win_useradd: Improve unicode support on Py2
2017-04-28 06:24:46 -06:00
Mike Place
18fdd8cc34
Merge pull request #40861 from DSRCorporation/bugs/37307_minion_run_jobs_twice
...
Don't run status.master while minion is failing-over.
2017-04-28 06:14:55 -06:00
Mike Place
34c2079d8b
Merge pull request #40913 from twangboy/unicode_win_system
...
win_system: Fix unicode support on Py2
2017-04-28 06:06:12 -06:00
Mike Place
62cb7b1ae6
Merge pull request #40923 from terminalmage/aptpkg-install-fix-unhold
...
aptpkg: fix temp pkg unhold when version is specified
2017-04-28 05:59:53 -06:00
Mike Place
5e79c9a3a4
Merge pull request #40926 from twangboy/py3_setup
...
Use req files in pkg\windows for setup
2017-04-28 05:57:25 -06:00
Mike Place
9d92ba7878
Merge pull request #40933 from gtmanfred/2016.11
...
allow master_port to be a string
2017-04-28 05:54:57 -06:00
Mike Place
d5e0b8b655
Merge pull request #40934 from gtmanfred/ipv6
...
Only display IPvX warning if role is master
2017-04-28 05:53:50 -06:00
Mike Place
8fdfe4ece6
Merge pull request #40935 from gtmanfred/softlayer
...
Attempt to connect to public ip address in softlayer
2017-04-28 05:43:57 -06:00
Mike Place
8cb5ce2eb3
Merge pull request #40939 from Ch3LL/fix_vmware_deploy
...
Allow vmware to query deploy arg from opts
2017-04-28 05:40:25 -06:00
Daniel Wallace
f7a6f35370
allow dynamic loading of cloud drivers
2017-04-27 18:32:45 -06:00
Erik Johnson
9f27f362ca
Add HTTP git_pillar integration tests for pygit2
...
Also work around ssh auth issues in Ubuntu
2017-04-27 18:20:18 -05:00
