Bo Maryniuk
|
8b5af58066
|
Fix lints
|
2018-02-12 18:54:23 +01:00 |
|
Bo Maryniuk
|
07ef909ea9
|
Remove unused variables, rename mixin variable to more exact name
|
2018-02-12 18:54:23 +01:00 |
|
Bo Maryniuk
|
9fa6647bd0
|
Refactor a unit test for calling PID file removal without the exception
|
2018-02-12 18:54:23 +01:00 |
|
Bo Maryniuk
|
fe4502b0e4
|
Add debug logging call to the unit test check
|
2018-02-12 18:54:23 +01:00 |
|
Bo Maryniuk
|
d9941ce1f3
|
Throw away unnecessary variable handling
|
2018-02-12 18:54:23 +01:00 |
|
Bo Maryniuk
|
56818045b6
|
Add unit test for calling PID deletion as non-root user
|
2018-02-12 18:54:23 +01:00 |
|
Bo Maryniuk
|
2f5b133149
|
Fix unit test to attempt remove PID file as root
|
2018-02-12 18:54:23 +01:00 |
|
Bo Maryniuk
|
3a8e43f806
|
Add tear-down method
|
2018-02-12 18:54:23 +01:00 |
|
Bo Maryniuk
|
7a0e3e983c
|
Use pytest
|
2018-02-12 18:54:23 +01:00 |
|
Erik Johnson
|
e0890baa31
|
Use correct attribute in test_log_created
|
2018-01-17 19:54:47 -06:00 |
|
Erik Johnson
|
2ab1e71ef2
|
[PY3] Add unicode_literals to salt.utils modules (P)
|
2018-01-17 19:54:44 -06:00 |
|
rallytime
|
60370f5fb6
|
Merge branch '2017.7' into 'oxygen'
Conflicts:
- salt/config/__init__.py
- salt/daemons/masterapi.py
- salt/proxy/dummy.py
- salt/states/file.py
- tests/integration/modules/test_state.py
- tests/integration/runners/test_runner_returns.py
- tests/integration/ssh/test_state.py
- tests/support/parser/__init__.py
- tests/unit/grains/test_core.py
- tests/unit/states/test_file.py
|
2018-01-11 16:00:08 -05:00 |
|
rallytime
|
8025b14584
|
Merge branch '2016.11' into '2017.7'
Conflicts:
- tests/unit/utils/test_parsers.py
|
2018-01-04 17:37:48 -05:00 |
|
rallytime
|
ec2a32a106
|
Update old utils paths to new paths
|
2017-12-20 08:03:14 -05:00 |
|
rallytime
|
3e319d50b3
|
Merge branch '2017.7' into 'oxygen'
Conflicts:
- README.rst
- salt/modules/win_pkg.py
- salt/utils/process.py
|
2017-12-14 13:01:29 -05:00 |
|
twangboy
|
40665d7b08
|
Skip test_log_created on Windows
|
2017-12-13 14:12:07 -07:00 |
|
rallytime
|
08c71f13e4
|
Merge branch '2017.7' into 'oxygen'
Conflicts:
- doc/ref/configuration/minion.rst
- doc/topics/thorium/index.rst
- salt/beacons/__init__.py
- salt/client/mixins.py
- salt/client/ssh/wrapper/state.py
- salt/daemons/masterapi.py
- salt/grains/extra.py
- salt/minion.py
- salt/modules/cron.py
- salt/modules/file.py
- salt/modules/mac_user.py
- salt/modules/napalm_network.py
- salt/modules/state.py
- salt/modules/win_file.py
- salt/modules/win_pkg.py
- salt/proxy/dummy.py
- salt/state.py
- salt/states/file.py
- salt/states/lxc.py
- salt/utils/__init__.py
- salt/utils/schedule.py
- tests/integration/modules/test_file.py
- tests/integration/modules/test_groupadd.py
- tests/integration/ssh/test_state.py
- tests/integration/states/test_file.py
- tests/unit/daemons/test_masterapi.py
- tests/unit/grains/test_core.py
- tests/unit/modules/test_disk.py
- tests/unit/modules/test_napalm_network.py
- tests/unit/modules/test_state.py
- tests/unit/test_minion.py
- tests/unit/utils/test_process.py
|
2017-12-11 18:24:41 -05:00 |
|
Ch3LL
|
3bb58fb577
|
skip salt-key log creation test
|
2017-12-11 10:59:10 -05:00 |
|
Ch3LL
|
6a379195bc
|
Add test to ensure log files are created
|
2017-12-07 17:31:26 -05:00 |
|
rallytime
|
54c4be35ae
|
Update any moved utils references from the merge-forward
|
2017-10-16 15:47:32 -04:00 |
|
Nicole Thomas
|
9fe94d7843
|
Merge pull request #44098 from twangboy/win_mock_test_parsers
Return multiprocessing queue in LogSetupMock class
|
2017-10-16 14:14:29 -04:00 |
|
twangboy
|
caf086c05a
|
Skip Master, Minion, and Syndic parser tests
|
2017-10-13 16:02:01 -06:00 |
|
twangboy
|
cc43ca27af
|
Return multiprocessing queue in LogSetupMock class
|
2017-10-13 15:47:19 -06:00 |
|
rallytime
|
cbae45bec4
|
Lint: Remove extra line at end of file
|
2017-09-22 10:33:10 -04:00 |
|
rallytime
|
fca4e5563a
|
Merge branch '2016.11' into '2017.7'
Conflicts:
- salt/modules/win_pkg.py
- tests/unit/utils/test_parsers.py
|
2017-09-22 09:40:03 -04:00 |
|
rallytime
|
616ac7289b
|
Merge branch '2016.11' into 'nitrogen'
Conflicts:
- salt/config/__init__.py
- salt/modules/elasticsearch.py
- tests/integration/__init__.py
|
2017-05-23 10:36:41 -06:00 |
|
Pedro Algarvio
|
7b713d9256
|
Use the more portable helper skip_if_not_root .
|
2017-04-04 18:58:21 +01:00 |
|
Pedro Algarvio
|
a15aa32404
|
Proper mocking.
|
2017-04-01 14:22:59 +01: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 |
|