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
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
Mike Place
ad4d6839fd
Merge pull request #40675 from gtmanfred/2016.11
...
use loader for getting war version
2017-04-13 13:58:30 -06:00
rallytime
e440d2e8af
Use self.setGrains as context manager in grains test
2017-04-13 13:39:11 -06:00
Ch3LL
e30afc4c01
add exception type
2017-04-13 15:06:12 -04:00
Ch3LL
acf333df08
change errno code for fileclient test
2017-04-13 14:56:45 -04:00
rallytime
3d6c983c69
Remove unused import for lint
2017-04-13 11:52:20 -06:00
Daniel Wallace
a61fc824c4
use loader for war extraction
...
Also set the version added in the docs
2017-04-13 11:51:22 -06:00
rallytime
17efc7341c
Merge branch '2016.11' into 'nitrogen'
...
Conflicts:
- salt/modules/win_wua.py
- salt/netapi/rest_cherrypy/app.py
- salt/version.py
- tests/unit/states/grains_test.py
- tests/unit/states/test_archive.py
2017-04-13 10:14:51 -06:00
Ch3LL
60724980ec
fix test_fstype test for mac
2017-04-13 12:04:20 -04:00
Mike Place
92b5f03beb
Merge pull request #40551 from terminalmage/issue39868
...
Fix four issues in archive.extracted state
2017-04-12 12:37:51 -06:00
Daniel Wallace
b0bd99c26d
add comment and unit test
2017-04-11 21:08:06 -06:00
Mike Place
4af8d08e43
Merge pull request #40581 from terminalmage/release_notes
...
Make scheduled change to osmajorrrelease grain, clean up Nitrogen release notes
2017-04-11 16:49:15 -06:00
rallytime
cd0adb82d6
Spelling fix
2017-04-11 13:35:38 -06:00
rallytime
36f7a6481b
Remove blacklisted loader usage of dunder variables
2017-04-11 12:16:15 -06:00
Erik Johnson
20f856f038
Update unit tests for numeric osmajorrelease
2017-04-11 12:36:36 -05:00
rallytime
67d08f60ff
Fixup fileclient_test file to conform to new standards
2017-04-10 14:09:41 -06:00
rallytime
2cd0c5e4ec
Merge branch '2016.11' into 'nitrogen'
...
Conflicts:
- doc/topics/cloud/azurearm.rst
- salt/cloud/clouds/vultrpy.py
- salt/modules/aptpkg.py
- salt/modules/dockermod.py
- tests/unit/modules/dockerng_test.py
- tests/unit/modules/test_pillar.py
2017-04-10 14:09:25 -06:00
Erik Johnson
5ea1f607b0
Fix mocking in unit tests
2017-04-10 13:57:39 -05:00
rallytime
5a419b8aae
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/modules/pillar.py
2017-04-07 11:23:41 -06:00
Erik Johnson
f8bc423ef9
Merge pull request #40563 from terminalmage/merge-2016.3-2016.11
...
Merge-forward 2016.3 -> 2016.11
2017-04-07 10:08:19 -05:00
Erik Johnson
0c608d7417
Add client_args_mock back to test
...
I removed this incorrectly in resolving a merge conflict.
2017-04-07 08:50:45 -05:00
Mike Place
83f6d3d3bb
Merge pull request #40567 from terminalmage/fix-pillar-get-merge-lists
...
Allow pillar.get to merge list as well as dictionaries
2017-04-06 15:54:16 -06:00
Nicole Thomas
ae13de622a
Merge pull request #40451 from isbm/isbm-fileclient-testcase-2016.11
...
Fileclient testcase (2016.11)
2017-04-06 13:53:30 -06:00
Mike Place
56363bc41c
Merge pull request #40462 from cachedout/state_expect_minions
...
Fix orch state when no minions return
2017-04-06 11:58:14 -06:00
Erik Johnson
cb4db56eb5
Allow pillar.get to merge list as well as dictionaries
...
This also gets rid of the exception that used to be raised when the
default was not of the proper type, and instead skips merging in those
cases.
2017-04-06 12:24:22 -05:00
Mike Place
60750a1619
Fix test
2017-04-06 10:48:27 -06:00
Erik Johnson
a6d68f50fe
Merge remote-tracking branch 'upstream/2016.3' into merge-2016.3-2016.11
2017-04-06 10:15:47 -05:00
Pedro Algarvio
2d32fab65b
Don't instantiate the log handler if unable to connect to server
2017-04-05 23:29:13 +01:00
Pedro Algarvio
0b2364e57d
White-space lint fix
2017-04-05 23:19:53 +01:00
