Pedro Algarvio
cbef6c044f
Re-enable the test since we now have the flaky decorator
2017-03-02 19:56:05 +00:00
Mike Place
71410047f0
Merge pull request #39682 from ni3mm4nd/mongodb_user
...
Add support for user roles in present state
2017-03-02 10:17:38 -07:00
Joseph Hall
bdb26ddf83
Create master cache dir
2017-03-01 16:09:13 -07:00
Joseph Hall
8058bbe6ca
Just set all the default minion opts and be done with it
2017-03-01 13:12:18 -07:00
Joseph Hall
925eb7ffea
Add environment to test
2017-03-01 12:56:23 -07:00
Mike Place
320b39bc12
Fix broken test and lint issue
2017-03-01 11:57:28 -07:00
Joseph Hall
88a38d5ee9
Add id to test
2017-03-01 11:42:05 -07:00
Joseph Hall
8b8320d56d
Add renderer variable to tests
2017-03-01 10:41:52 -07:00
Joseph Hall
bd2e1427ad
Add cachedir to test
2017-03-01 10:40:31 -07:00
Mike Place
4fc0451d64
Merge pull request #39702 from techhat/spmfiles
...
Add files section to FORMULA files
2017-03-01 10:18:30 -07:00
Mike Place
4a0c2dfcc3
Merge pull request #39725 from bodhi-space/infra4487
...
INFRA-4487 - 'test=True' should return True rather than None if no changes are scheduled.
2017-03-01 10:02:11 -07:00
Kadlec Jan
d5d99d6399
recteate unit tests
2017-03-01 07:13:28 +01:00
Tom Williams
aa8d822e78
INFRA-4487 - fix unit test to match corrected return value
2017-02-28 21:01:57 -05: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
53eff91efa
Re-enable the test since we now have the flaky decorator
2017-02-28 22:52:48 +00:00
Pedro Algarvio
2a9d2beb02
The order is shady under Py3
...
/cc @cachedout @rallytime
2017-02-28 22:52:48 +00:00
Pedro Algarvio
1daa2e24cd
Moved some test supporting modules to tests/support
...
Previously they were in tests/utils which also had test case modules.
2017-02-28 22:52:48 +00:00
Mike Place
ec79d238fb
Merge pull request #39732 from gtmanfred/develop
...
Add queueing of runner tasks using the scheduler and queue runner
2017-02-28 15:09:43 -07:00
Daniel Wallace
39bb623bdc
fix pylint
2017-02-28 14:53:02 -06:00
Daniel Wallace
878b21662e
add test for queue
2017-02-28 14:10:41 -06:00
Calle Pettersson
4154910dd3
Vault: Handle patterns with non-existing keys
2017-02-28 21:07:49 +01:00
Nicole Thomas
8809d33674
Merge pull request #39701 from rallytime/merge-develop
...
[develop] Merge forward from 2016.11 to develop
2017-02-28 12:50:10 -07:00
Joseph Hall
6c5bc20344
Handle paths for multiple operating systems
2017-02-28 11:41:29 -07:00
rallytime
ddf8f87249
Add some additional mocks for win_iis unit test
2017-02-28 10:36:11 -07:00
Mike Place
09ac8822c5
Merge pull request #39672 from carlpett/feature/vault-list-expansion
...
Vault: Add support for expanding lists in policies
2017-02-27 17:33:02 -07:00
Joseph Hall
d1f0a74a7c
Add files section to FORMULA files
2017-02-27 16:59:13 -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
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
Calle Pettersson
6dac1c710e
Vault: Add support for expanding lists in policies
2017-02-27 19:55:26 +01: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
