Joseph Hall
d1f0a74a7c
Add files section to FORMULA files
2017-02-27 16:59:13 -07:00
Mike Place
3037e7de46
Merge pull request #39651 from DennisHarper/fixNoneCache
...
Checking Instance when calling a function that can return None
2017-02-27 13:21:00 -07:00
dharper
c71753197a
Checking instance exists in master._get_cached_minion_data when cache.fetch returns None
2017-02-27 09:37:37 -06:00
Erik Johnson
28564da966
Implement no_block for service.running/service.dead (systemd only)
2017-02-24 15:14:09 -06:00
Daniel Wallace
89101fa342
allow sls_build to be used with states
2017-02-24 11:47:13 -06:00
Pedro Algarvio
0e1e133169
Fix a weird import issue
...
```
ImportError: Failed to import test module: unit.modules.docker_test
Traceback (most recent call last):
File "/usr/lib64/python2.7/unittest/loader.py", line 252, in _find_tests
module = self._get_module_from_name(name)
File "/usr/lib64/python2.7/unittest/loader.py", line 230, in _get_module_from_name
__import__(name)
File "/testing/tests/unit/modules/docker_test.py", line 39, in <module>
class DockerTestCase(TestCase):
File "/testing/tests/unit/modules/docker_test.py", line 103, in DockerTestCase
@skipIf(_docker_py_version() < (1, 4, 0),
File "/testing/tests/unit/modules/docker_test.py", line 34, in _docker_py_version
return docker_mod.docker.version_info
AttributeError: 'module' object has no attribute 'version_info'
```
2017-02-24 09:11:23 +00:00
Pedro Algarvio
f9015ff1e4
Don't even try to concatenate non string types
2017-02-24 09:11:21 +00:00
Pedro Algarvio
62f55073c9
Fix test cases(no longer logging errors).
2017-02-24 00:49:33 +00:00
Pedro Algarvio
5d0110d98b
Code cleanup
2017-02-24 00:49:33 +00:00
Pedro Algarvio
ae46b0da3a
Code cleanup
2017-02-24 00:49:32 +00:00
Pedro Algarvio
3a85996d2a
Code cleanup
2017-02-24 00:49:32 +00:00
Pedro Algarvio
f7974b186b
Code cleanup
2017-02-24 00:49:32 +00:00
Pedro Algarvio
7fff27627a
Code cleanup
2017-02-24 00:49:32 +00:00
Pedro Algarvio
5fb0aa5dcf
Code cleanup
2017-02-24 00:49:31 +00:00
Pedro Algarvio
019225ec47
Code cleanup. We aren't even using mock!
2017-02-24 00:49:31 +00:00
Pedro Algarvio
62cf3c454e
Add LoaderModuleMockMixin
2017-02-24 00:49:31 +00:00
Pedro Algarvio
ad3dbee189
Add test case to make sure we always proper test module names from now on
2017-02-23 23:19:46 +00:00
Pedro Algarvio
bdb3cc3d89
Test websockets against the actual tornado application created in salt
2017-02-23 23:19:45 +00:00
Pedro Algarvio
b0794617c5
Fix unit.utils.test_warnings after the rename changes
2017-02-23 23:19:45 +00:00
Pedro Algarvio
4ff190cac6
Fix, simplify, syntax the test_doc unit test
2017-02-23 23:19:45 +00:00
Pedro Algarvio
cb7a25e4a2
Somehow salt.utils.boto3 is "landing" as boto3 in sys.modules
2017-02-23 23:19:43 +00:00
Pedro Algarvio
1e2753c875
Fix imports after renames
2017-02-23 23:19:43 +00:00
Pedro Algarvio
5576f6ed33
Gate it!
2017-02-23 23:19:42 +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
9bb56da613
Fix skipIf call and _docker_py_version
2017-02-23 12:55:52 +00:00
Pedro Algarvio
1416dd2e9a
We must compare tuples
2017-02-23 10:40:59 +00:00
Pedro Algarvio
8dc1c780b7
Add missing mock patch
2017-02-23 10:40:58 +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
Pedro Algarvio
e16dc832b2
Code cleanup. Tests are not destructive. Py3 compat.
2017-02-23 10:40:58 +00:00
Mike Place
4279c39f41
Merge pull request #39576 from rallytime/merge-develop
...
[develop] Merge forward from 2016.11 to develop
2017-02-22 19:09:56 -07:00
rallytime
5db986860c
[develop] Fix some pylint errors that snuck into develop
2017-02-22 17:02:21 -07:00
rallytime
2595ac383d
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/config/__init__.py
- salt/modules/docker.py
- salt/states/docker.py
2017-02-22 16:24:36 -07:00
Sergei Zviagintsev
ad5b52ce3c
Add unit test for salt.utils.cloud.check_key_path_and_mode
2017-02-22 11:38:40 +01:00
Sergei Zviagintsev
313e9cae06
Add unit test for _validate_key_file_permissions in ec2 module
2017-02-22 11:38:40 +01:00
rallytime
c613d19e76
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/modules/dockerng.py
- salt/states/dockerng.py
2017-02-21 13:59:14 -07:00
Erik Johnson
ec2b617a5d
Fixes for docker tests
...
These tests were failing because of improper mocking. The mocks were
assigned to the __salt__ dunder but we should have been patching the
attributes of the docker execution module directly.
2017-02-18 21:58:25 -06:00
Erik Johnson
c673d06f48
Rename dockerng state/execution module to docker
2017-02-18 21:58:25 -06:00
Erik Johnson
6e24dd85c4
Remove dockerio state/module (moved to salt-contrib)
2017-02-18 21:58:24 -06:00
Mike Place
179e143272
Merge pull request #39385 from curiositycasualty/develop
...
modules.file: Return true when a symlink is already in desired state
2017-02-17 15:24:53 -07:00
Pedro Algarvio
20882bfcb4
These tests require root for default paths and create directories if non existing
2017-02-17 20:48:57 +00:00
Pedro Algarvio
a8e32cf076
**kwargs ordering is different under Py3
2017-02-17 20:48:56 +00:00
Pedro Algarvio
f921c1e131
Sort before asserting since the order changes between py2 and py3
2017-02-17 20:48:56 +00:00
Pedro Algarvio
9503045b05
Use tempfile.gettempdir() since that depends on current user and distro setup
2017-02-17 20:48:56 +00:00
Pedro Algarvio
33d8832e40
Assert different outcome under Py3
2017-02-17 20:48:56 +00:00
Pedro Algarvio
90adbe925f
Force dictionary order
2017-02-17 20:48:56 +00:00
Pedro Algarvio
9b2d79317a
Handle different test outcome under Py3
2017-02-17 20:48:55 +00:00
Pedro Algarvio
1d060096e3
Force ordering under Py3
2017-02-17 20:48:55 +00:00
Pedro Algarvio
04b4d0947e
Disable tests on Py3.
...
The order of attributes is sketchy under Py3 and this code will be
deprecated.
2017-02-17 20:48:55 +00:00
Pedro Algarvio
c093d97a93
Only run the ascii case on Py2
2017-02-17 20:48:55 +00:00
