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
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
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
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
Ch3LL
47cd491995
allow vmware to query deploy arg from opts
2017-04-27 16:31:42 -04:00
Nicole Thomas
abb42d1de3
Merge pull request #40932 from rallytime/merge-nitrogen
...
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-04-27 11:47:05 -06:00
rallytime
7fb12e47d5
Merge branch '2016.11' into 'nitrogen'
...
No conflicts.
2017-04-27 10:37:43 -06:00
twangboy
c03f8d39d2
Use req_2.txt for Py2
2017-04-27 09:51:32 -06:00
twangboy
57d5f781f4
Use req files in pkg\windows for setup
2017-04-27 09:47:46 -06:00
Mike Place
0f2ec1e1db
Merge pull request #40894 from senthilkumar-e/broken_jobs_api_fix
...
Fix for broken /jobs/<jid> in 2016.11.4
2017-04-27 05:32:59 -06:00
twangboy
1c3cd62594
Fix unicode support for win_system
2017-04-26 17:53:25 -06:00
Nicole Thomas
92003e2776
Merge pull request #40869 from gtmanfred/nitrogen
...
Backport Fix for docker.push/pull
2017-04-26 09:31:21 -06:00
Nicole Thomas
ea55c15367
Merge pull request #40876 from BenoitKnecht/fix-sqlite3-table-present-with-multiline-schema
...
states: sqlite3: fix table_present with multi-line schema
2017-04-26 09:21:18 -06:00
senthilkumar-e
2f55b26e08
Fixing the pylint issue
2017-04-26 20:51:14 +05:30
senthilkumar-e
fb607bab75
Fix for broken /jobs/<jid> in 2016.11.4
...
Fixes #40845
2017-04-26 11:22:12 +05:30
Nicole Thomas
e09bafdceb
Merge pull request #40742 from clinta/40741
...
Fix #40741
2017-04-25 16:52:05 -06:00
Nicole Thomas
7c10a419a1
Merge pull request #40866 from rallytime/merge-nitrogen
...
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-04-25 16:42:11 -06:00
rallytime
2f1998ac00
Pylint extra space
2017-04-25 16:41:39 -06:00
rallytime
ad9914353b
Pylint fixes
2017-04-25 14:18:50 -06:00
rallytime
c3f4874c21
Pylint fixes and rework new test in dimensiondata cloud unit tests
2017-04-25 11:06:55 -06:00
rallytime
8e24b3a8b2
Pylint fixes for some cloud unit tests
2017-04-25 11:06:39 -06:00
rallytime
7f14a6491e
Rename nova and openstack unit tests to test_*.py
2017-04-25 09:27:11 -06:00
Benoît Knecht
2ca627d02d
states: sqlite3: fix table_present with multi-line schema
...
With a sqlite3 database containing a table with this schema:
CREATE TABLE `user` (
`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL
, `login` TEXT NOT NULL)
using `sqlite3.table_present` with this definition:
user:
sqlite3.table_present:
- db: /tmp/sqlite.db
- schema: |
CREATE TABLE `user` (
`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL
, `login` TEXT NOT NULL)
returns an error indicating that the schemas do not match. That's
because the `schema` variable in the YAML ends with a newline, while the
schema returned by python-sqlite3 doesn't.
This commit strips leading and trailing whitespace from the YAML schema.
2017-04-25 14:23:34 +02:00
Mike Place
5d9dd3ad56
Merge pull request #40805 from terminalmage/moby
...
Alias moby to docker in Nitrogen (and later)
2017-04-24 22:37:53 -06:00
Mike Place
d5c781b40b
Merge pull request #40858 from rallytime/locale-fixes
...
Use locale_search_str variable in locale.gen_locale and add error handling to integration test
2017-04-24 22:32:48 -06:00
Mike Place
5249496f74
Merge pull request #40859 from skizunov/develop2
...
Fix TCP Transport to work with Tornado 4.5
2017-04-24 22:28:59 -06:00
Nicole Thomas
ca80f287af
Merge pull request #40862 from gtmanfred/2016.11
...
status should be an int
2017-04-24 17:11:30 -06:00
Nicole Thomas
c95341959d
Merge pull request #40865 from rallytime/merge-2016.11
...
[2016.11] Merge forward from 2016.3 to 2016.11
2017-04-24 17:06:27 -06:00
Erik Johnson
ab7b2b36b0
Fix docker.push/pull
...
Resolves https://github.com/saltstack/salt/issues/40864
2017-04-24 16:52:40 -06:00
twangboy
b2a017f1e6
Documents the use of Unicode Strings
2017-04-24 16:21:46 -06:00
rallytime
5372f25fde
Merge branch '2016.11' into 'nitrogen'
...
Conflicts:
- salt/cloud/clouds/rackspace.py
- tests/unit/cloud/clouds/test_dimensiondata.py
2017-04-24 15:35:28 -06:00
