Pedro Algarvio
2c6725d96e
Tell python that we're done with this dictionary
2017-04-28 13:33:37 +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
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
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
4062bd9fd9
Don't attempt connections at the module level!
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
41df7eca96
Use setUpClass instead of __init__
2017-04-28 13:33:31 +01: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
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
rallytime
44623863fa
Clean up integration test checks to be more encompassing
2017-04-24 15:12:20 -06:00
rallytime
3dc93be6f6
Skip test if no charmaps are found
...
The "loacle -m" command might not return an error, but it might
just be empty. Let's not fail on a test that we're already logging
to the user.
2017-04-24 12:38:49 -06:00
rallytime
7efebc9f78
Remove assertion against an empty string
...
Returning an empty string is the expected behavior if the locale
is not set. This happens for example on the Fedora 24 test boxes.
2017-04-24 12:19:06 -06:00
rallytime
e3550ab44c
Skip gen_locale test if charmaps aren't available on the test machine
...
The error of missing charmaps gets logged to the user. We shouldn't
be running the test for the gen_locale if we don't have charmaps
available on the test machine.
2017-04-24 12:17:29 -06:00
Bo Maryniuk
116c96a4b7
Fix UT parameter changes
2017-04-22 10:08:20 +02:00
Bo Maryniuk
ed84420df0
Add unit test for node ip filtering
2017-04-22 10:08:20 +02:00
Bo Maryniuk
82582cff77
Skip test, if libcloud is not around
2017-04-22 10:08:20 +02:00
Bo Maryniuk
f005d53c56
Fix name error exception
2017-04-22 10:08:20 +02:00
Bo Maryniuk
5e574a24d9
Add unit test for nova connector
2017-04-22 10:08:19 +02:00
Bo Maryniuk
cd43805770
Add initial unit test for openstack cloud module
2017-04-22 10:08:19 +02:00
Bo Maryniuk
177f31446d
Add fake preferred IP function for testing
2017-04-22 10:08:19 +02:00
rallytime
3898117d6e
Update os_family grain to be "Suse" instead of "SUSE" for localemod
...
Also update some of the test functions to be a little more clear
2017-04-21 16:14:50 -06:00
rallytime
d5b1241972
Skip tsl unit test when we hit an error due to OpenSSL and junos-eznc packaging conflict
...
he pip junos-eznc package, when installed with PyOpenSSL version 0.14 causes
this test failure. If you either remove junos-eznc, or upgrade PyOpenSSL
(current is 0.17) the test is happy. So, we need to handle this case in the test.
2017-04-20 17:02:33 -06:00
rallytime
bad421be66
Update managed.sls test file: osmajorrelease grain is an int now
...
We need to make the comparison in the file to `7` instead of `'7'`,
otherwise the state doesn't execute correctly and the test_pkgrepo
test will fail because the state didn't run.
2017-04-20 12:27:45 -06:00
rallytime
6493880bde
Merge branch '2016.11' into 'nitrogen'
...
No conflicts.
2017-04-18 16:42:30 -06:00
Nicole Thomas
d0b90058c4
Merge pull request #40706 from twangboy/fix_whitelist
...
Remove non-existent tests from whitelist
2017-04-18 10:30:55 -06:00
Mike Place
2ab95b7dd5
Set minion test to use default opts
2017-04-18 08:34:57 -06:00
twangboy
e4876abcde
Add back the two loader tests
2017-04-17 14:04:20 -06:00
rallytime
292f55600b
Merge branch '2016.11' into 'nitrogen'
...
Conflicts:
- salt/fileserver/s3fs.py
- tests/unit/test_fileclient.py
2017-04-17 13:32:56 -06:00
twangboy
9d7f78e896
Remove non-existent tests from whitelist
2017-04-14 14:35:06 -06:00
Nicole Thomas
77028a6c4e
Merge pull request #40685 from Ch3LL/fix_mac_file
...
Fix errno code for filecache test for other operating systems.
2017-04-14 10:54:25 -06:00
rallytime
f552dd63f3
Merge branch '2016.11' into 'nitrogen'
...
Conflicts:
- pkg/windows/installer/Salt-Minion-Setup.nsi
- tests/unit/states/test_tomcat.py
2017-04-14 10:46:56 -06:00
Ch3LL
9ea6e8b456
remove io and change to EROFS
2017-04-13 18:10:44 -04:00
Ch3LL
688791ff60
remove try-except and change errno
2017-04-13 17:06:44 -04:00
