rallytime
a876bcdb8a
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-04-27 10:37:05 -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
Anthony Shaw
5dee8b12de
add support for custom algorithms and complementary test
2017-04-25 21:47:38 +10:00
Anthony Shaw
867e6c1ce5
tests for load balancer and lint for other modules, fixes for load balancer
2017-04-25 21:07:27 +10:00
Anthony Shaw
5f03b7a506
tests for load balancer and fixed issue with destroy balancer
2017-04-25 20:44:36 +10:00
Anthony Shaw
bb4ec6c4db
tests for the storage module
2017-04-25 20:27:52 +10: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
Anthony Shaw
2ec6da0383
Merge branch 'develop' into libcloud_storage
2017-04-25 07:25:57 +10:00
rallytime
ce13658301
Lint fixes for keystone state and keystone state unit tests
2017-04-24 09:27:52 -06:00
Anthony Shaw
2b4d84ef3f
add a unit test to check the module starts correctly
2017-04-24 16:35:16 +10:00
Mike Place
6da806d1cc
Merge pull request #39850 from epcim/pr_fix_keystone_endpoints_multiregion
...
Fix endpoint handling per region
2017-04-23 04:00:00 -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
a7eb8f717e
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-04-21 09:50:25 -06:00
Petr Michalec
ab1dd446e7
Endpoint handling per region, fixes #35874
...
- extend tests for multiple regions
- region arg by default set to None
- print verbose changes to be exec.
2017-04-21 15:48:52 +02:00
Mike Place
8652ad68c8
Merge pull request #40753 from arno01/dockerng-enhanced
...
dockerng: avoid network duplication and add driver_opts
2017-04-21 05:21:33 -06:00
Andrey Arapov
4c29c5f6ab
dockerng: avoid network duplication and add driver_opts
2017-04-21 08:52:55 +02: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
0616405104
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-04-18 16:43:11 -06:00
rallytime
6493880bde
Merge branch '2016.11' into 'nitrogen'
...
No conflicts.
2017-04-18 16:42:30 -06:00
Mike Place
2ab95b7dd5
Set minion test to use default opts
2017-04-18 08:34:57 -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
rallytime
885419b3e7
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-04-17 13:27:58 -06:00
Mike Place
f7b062acd7
Merge pull request #40266 from meaksh/develop-pkg-improvements
...
[develop] Adding "pkg.downloaded" state and support for installing patches/erratas
2017-04-17 11:34:42 -06:00
Pablo Suárez Hernández
fa9e7f01f7
Pylint fix
2017-04-17 14:18:09 +01:00
Pablo Suárez Hernández
40422ecd02
Adding more unit tests for Zypper module
2017-04-17 13:06:35 +01:00
Pablo Suárez Hernández
5701e90803
Adding unit tests for Zypper execution module
2017-04-17 13:02:08 +01: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
9905eb7273
Merge branch 'nitrogen' into 'develop'
...
Conflicts:
- salt/netapi/__init__.py
2017-04-14 10:50:31 -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
Nicole Thomas
88f514835d
Merge pull request #40677 from rallytime/merge-develop
...
[develop] Merge forward from nitrogen to develop
2017-04-13 13:19:07 -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