rallytime
8d1e1e7f94
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- .kitchen.yml
- Gemfile
- pkg/windows/build_env_2.ps1
- pkg/windows/build_env_3.ps1
- pkg/windows/req.txt
- salt/client/ssh/__init__.py
- salt/client/ssh/ssh_py_shim.py
- salt/modules/boto_vpc.py
- salt/modules/file.py
- salt/modules/heat.py
- salt/modules/smartos_vmadm.py
- salt/modules/win_dsc.py
- salt/returners/elasticsearch_return.py
- salt/runners/salt.py
- salt/states/module.py
- salt/utils/win_functions.py
- setup.py
- tests/integration/modules/test_state.py
- tests/unit/grains/test_core.py
- tests/unit/test_pillar.py
2018-03-15 17:22:05 -04:00
Benjamin Drung
a3c54b50f6
Fix various spelling mistakes
...
lintian found various spelling mistakes.
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2018-03-08 15:25:42 +01:00
Erik Johnson
1668a489c4
Update refrences to Oxygen codename to 2018.3.0
2018-02-21 21:47:41 -06:00
Daniel Wallace
3e093ba022
fix pylint
2018-02-08 09:37:11 -07:00
Daniel Wallace
56c5a333cd
add test to verify clusters
...
This test just double checks that the get_mor_containers is called twice when
trying to use a Cluster, and once if a datastore is specified.
2018-02-07 17:03:13 -07:00
Erik Johnson
d3f8c13414
[PY3] Add unicode_literals to salt-cloud modules
2018-01-04 13:39:59 -06:00
Daniel Wallace
9e5d6c03f8
Merge branch 'develop' into shade
2017-12-11 08:53:13 -07:00
Nicole Thomas
f7a0979449
Merge pull request #43969 from fishhead108/add-cloud.vmware.remove_snapshot-feature
...
Remove snapshot by name feature
2017-12-06 13:08:14 -05:00
Daniel Wallace
bfda932140
Remove irrelevant test
...
This test was used to make sure that our __query_node_data function correctly
queried the information about the server before we attempted to bootstrap it.
With shade, that function is no longer needed, because shade will query the
server and return back when the server is ready when `wait=True` is set. This
is set for all server builds.
2017-12-06 09:09:34 -07:00
Daniel Wallace
67320d3012
fix pylint
2017-12-06 09:07:35 -07:00
Nicole Thomas
3275dbeff9
Merge branch 'develop' into add-cloud.vmware.remove_snapshot-feature
2017-11-16 09:59:29 -05:00
fishhead108
8a681751fe
change call type
2017-11-16 00:07:03 +01:00
fishhead108
fc17d47bcf
add test_remove_snapshot_call_no_snapshot_name_in_kwargs
2017-11-16 00:05:22 +01:00
fishhead108
35f3c96ade
Test for convert_to_template_call
2017-11-15 22:26:42 +01:00
fishhead108
e8d1cd44ea
Test for remove_snapshot_call
2017-11-15 22:21:12 +01:00
Vernon Cole
d3769b3568
add saltify wake-on-lan and document it
2017-10-19 20:14:07 -06:00
Vernon Cole
4c8cd9c507
lint and comment fixes
2017-10-19 10:16:28 -06:00
Vernon Cole
2b4f69e1f8
remove unused parameter
2017-10-18 20:20:36 -06:00
Vernon Cole
cce7bc9719
add more unit tests
2017-10-18 20:06:14 -06:00
twangboy
1379627334
Fix unit.cloud.clouds.test_ec2 for Windows
...
Mock instead of create tempfile
2017-09-08 15:36:52 -06:00
Erik Johnson
d942752e95
Fix usage of assert_called_once in Python 3 < 3.6
...
This is a more complete fix which builds upon 41c65b0
2017-07-03 09:30:12 -05:00
rallytime
16a2747d7d
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- pkg/windows/buildenv/salt.bat
- salt/modules/pillar.py
- salt/utils/openstack/nova.py
- tests/unit/cloud/clouds/test_dimensiondata.py
- tests/unit/cloud/clouds/test_gce.py
2017-06-14 13:31:42 -06:00
rallytime
1e9a06000b
Bump version check down to 1.4.0 and use distutils.version lib
2017-06-14 09:30:22 -06:00
rallytime
a30f654b04
Support apache-libcloud work-around for issue #32743 for versions older than 2.0.0
...
If apache-libcloud 2.0.0 is installed, the workaround outlined in issue #32743
no longer applies and should be avoided. However, we still need to support older
versions of apache-libcloud that need this work-around.
The minimum version required of apache-libcloud has been updated to 2.0.0 in pull
request #40837 , which will released in Oxygen. #40837 has removed all of the
work-arounds needed for issue #32743 for 2.0.0. Until Oxygen is released, however,
we need to support both the work-around for older versions of apache-libcloud as
well as 2.0.0.
2017-06-13 14:22:32 -06:00
Pedro Algarvio
abe608d739
Drop @patch usage
2017-04-28 13:36:42 +01: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
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
Pedro Algarvio
3a5ec6bb0a
Minor lint fix
2017-04-01 14:22:58 +01:00
Pedro Algarvio
d397763553
Adjust to the new LoaderModuleMockMixin usage
2017-03-28 19:03:59 +01:00
Pedro Algarvio
1f7a0aa65b
Proper mocking
2017-03-28 19:00:51 +01:00
Adam Mendlik
6c6e8d17bc
Update unit test for Saltify with credential verification
2017-03-27 19:20:38 -06:00
Pedro Algarvio
0b41b92d7d
Use salt.utils.versions instead of distutils.version
2017-03-08 19:22:33 +00:00
Pedro Algarvio
d13b40554b
Use the __version__ variable from tests.support.mock
2017-03-06 14:35:12 +00:00
Pedro Algarvio
40a64191a1
Absolute imports and A LOT of code cleanup.
2017-03-01 01:33:07 +00:00
Pedro Algarvio
3beb3fb801
Move whatever we need from salttesting to salt.
...
Let's drop the salttesting dependency cycle.
2017-02-28 22:52:49 +00:00
Pedro Algarvio
15af4c9728
Test filenames conformity. Adjust for pytest.
2017-02-23 23:19:42 +00:00
Pedro Algarvio
ce71f6d45f
Code cleanup
2017-02-23 12:55:53 +00:00
Pedro Algarvio
e48ea8fa1b
Don't use assert_called_once() or assert_not_called().
...
These worked in Py2 but not in Py3.
A read of http://engineroom.trackmaven.com/blog/mocking-mistakes/ specially the section "Mocking the unexpected" will enlighten one.
2017-02-23 10:40:58 +00:00
rallytime
5db986860c
[develop] Fix some pylint errors that snuck into develop
2017-02-22 17:02:21 -07:00
