Commit Graph

5319 Commits

Author SHA1 Message Date
Kadlec Jan
93306ba8a8 Fix linode white space 2017-03-08 17:14:56 +01:00
Kadlec Jan
2c67cfdbdb Add function for matching key/value grains 2017-03-08 15:14:46 +01:00
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
Pedro Algarvio
6c9152764d
Use tests.support.mock 2017-03-06 14:35:13 +00:00
Pedro Algarvio
d13b40554b
Use the __version__ variable from tests.support.mock 2017-03-06 14:35:12 +00:00
Pedro Algarvio
69f1c0fc64 Merge pull request #39822 from s0undt3ch/features/py3
A tiny bit more of py3
2017-03-03 22:12:11 +00:00
Pedro Algarvio
44ba96613b
This needs to be done as a PyLint plugin not as this kind of test.
It's the only way we can check all code paths of the __virtual__
function.
Regarding the 3rd-party modules gating, we also need to create a pylint
plugin which known what are the hard deps of Salt and will complain on
all other 3rd-party imports.
2017-03-03 20:35:17 +00:00
Pedro Algarvio
f4732d5433
Lint fixes 2017-03-03 19:28:45 +00:00
Pedro Algarvio
f5de085ac4
Add test case which will catch SOME problems with __virtual__ calls.
And also 3rd-party import errors.
2017-03-03 15:19:34 +00:00
Pedro Algarvio
5f388e7ea2
Minor fixes 2017-03-03 15:19:24 +00:00
Calle Pettersson
c745415b8b Vault: Always lowercase policies 2017-03-03 09:05:27 +01:00
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