Nitin Kr
8c6f636a06
Merge pull request #20 from rajvidhimar/salt_test
...
Lint changes
2017-03-15 11:16:09 +05:30
rajvidhimar
dc2e3f4f2e
Clean up lint
2017-03-15 10:42:10 +05:30
Nitin Kr
30b0e1c9cd
Merge pull request #19 from rajvidhimar/salt_test
...
Fixed broken unit tests
2017-03-14 17:52:17 +05:30
rajvidhimar
0393ffab1c
Took care of commits
2017-03-14 17:51:17 +05:30
rajvidhimar
9c6b7279dc
Fixed broken unit tests
2017-03-14 17:46:04 +05:30
Nitin Kr
62e0281f85
Merge pull request #18 from rajvidhimar/salt_test
...
More unit tests
2017-03-14 17:41:56 +05:30
rajvidhimar
beba5a7331
Clean up
2017-03-09 11:15:15 +05:30
rajvidhimar
d8363d0958
Unit tests
2017-03-09 10:48:42 +05:30
vnitinv
4faee656c3
Merge remote-tracking branch 'upstream/develop' into develop
2017-03-08 17:30:21 +05:30
rajvidhimar
c49c8860ac
More test cases
2017-03-08 00:25:41 +05:30
rajvidhimar
a5527f690f
Fix tests
2017-03-07 16:14:23 +05:30
rajvidhimar
839cb66872
remove old file
2017-03-07 12:40:29 +05:30
rajvidhimar
3abbcc4ad3
Bug fixes
2017-03-07 12:34:09 +05:30
rajvidhimar
3a1b6558b6
Merge remote-tracking branch 'upstream/develop' into salt_test
2017-03-07 12:30:21 +05:30
rajvidhimar
6ff57331c5
Fix few bugs in the salt module
2017-03-07 12:29:09 +05:30
rajvidhimar
002f97bfe8
Adding unit tests
2017-03-07 11:22:15 +05:30
Pedro Algarvio
3ec0870ef6
Disable 3rd-party-module-not-gated
2017-03-06 14:42:31 +00:00
Pedro Algarvio
ffec7dc299
Lint fixes
2017-03-06 14:35:16 +00:00
rajvidhimar
691f602e7e
Unit tests
2017-03-06 16:58:53 +05:30
rajvidhimar
1f8fe142dd
Test cases
2017-03-06 14:55:40 +05:30
rajvidhimar
e047fd74ad
Test cases
2017-03-06 12:16:41 +05:30
rajvidhimar
47f9d32d80
Cover more code
2017-03-03 16:55:05 +05:30
rajvidhimar
d464a954ac
More tests and changes in junos module
2017-03-03 12:48:24 +05:30
rajvidhimar
970060e0d4
Unit tests
2017-03-02 10:50:41 +05:30
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
rallytime
ddf8f87249
Add some additional mocks for win_iis unit test
2017-02-28 10:36:11 -07:00
rallytime
b4366103a6
Merge branch '2016.11' into 'develop'
...
Conflicts:
- .pylintrc
- .testing.pylintrc
- salt/fileclient.py
- salt/minion.py
- salt/modules/docker.py
- salt/modules/win_iis.py
- salt/states/docker.py
- salt/states/file.py
- salt/utils/__init__.py
- tests/integration/modules/test_sysmod.py
2017-02-27 15:11:37 -07:00
rajvidhimar
6b9d89d706
Test cases
2017-02-27 12:44:23 +05:30
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
rajvidhimar
4cc6fd187b
Add junos test file
2017-02-24 10:19:24 +05:30
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
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
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
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
7b9b3f700d
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/modules/dockerng.py
- salt/states/dockerng.py
2017-02-22 16:27:08 -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
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
Mihai Dinca
9fedb84607
Always return oscap's stderr
2017-02-20 10:36:01 +01:00
Mihai Dinca
0ecde2cd02
Include oscap returncode in response
2017-02-20 10:36:01 +01: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
a8e32cf076
**kwargs ordering is different under Py3
2017-02-17 20:48:56 +00:00
