valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
83,611 Commits 24 Branches 182 Tags 341 MiB
13cc27bdab
Commit Graph

83611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Wallace
c471a29527 make cache dirs when spm starts 2017-09-11 09:53:32 -04:00
Nicole Thomas
b3116109e5 Merge pull request #43419 from gtmanfred/2017.7 
make cache dirs when spm starts
 2017-09-11 09:42:49 -04:00
Nicole Thomas
57cccd75d0 Merge pull request #43390 from aogier/43387-genesis-qemu 
better qemu_static parameter mangle in deboostrap management, tests
 2017-09-11 09:18:29 -04:00
matt LLVW
a3b2e19149 Fix /etc/hosts not being modified when hostname is changed 
Fixes #42926
 2017-09-11 11:58:02 +02:00
twangboy
90dcf8287c Fix unit.modules.test_hosts for Windows 
Fix problem with TmpStringIO Class on Windows. The module uses this
class twice in normal operation. In Windows there's an additional run
before the real runs where it is opened with mode='w'. This causes the
data to be wiped out. So, this sets it to only save the value in the
instance to data if it is not empty.

Use the windows path to the hosts file in Windows
 2017-09-08 17:21:01 -06:00
twangboy
b2cea18d13 Fix unit.modules.test_gem for Windows 
Mock `salt.utils.is_windows` to return False so the test will run on
Windows
 2017-09-08 15:53:07 -06:00
twangboy
1379627334 Fix unit.cloud.clouds.test_ec2 for Windows 
Mock instead of create tempfile
 2017-09-08 15:36:52 -06:00
Daniel Wallace
f85bf8c18f Revert "Reduce fileclient.get_file latency by merging _file_find and _file_hash" 
This reverts commit 94c62388e7.
 2017-09-08 15:08:06 -06:00
Daniel Wallace
58378866e5 make cache dirs when spm starts 2017-09-08 14:16:09 -06:00
Alessandro -oggei- Ogier
496f14a7e7 forgot to mock the proper one 2017-09-08 21:37:09 +02:00
MattLLVW
f6313a1b2c Merge branch '2017.7' into fix-env-order 2017-09-08 19:00:50 +02:00
Nicole Thomas
9b27473763 Merge pull request #43371 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-09-08 11:39:11 -04:00
matt
e93a962980 Fix env_order in state.py 
Fixes #42165
 2017-09-08 17:10:07 +02:00
Nicole Thomas
97f05ff603 Merge pull request #43398 from twangboy/win_fix_test_mount 
Fix `unit.modules.test_mount` for Windows
 2017-09-08 09:39:28 -04:00
Nicole Thomas
6a4cc5c1b0 Merge pull request #43399 from twangboy/win_fix_test_pam 
Fix `unit.modules.test_pam` for Windows
 2017-09-08 09:37:49 -04:00
Nicole Thomas
2b5cfae3f8 Merge pull request #43400 from twangboy/win_unit_test_parted 
Fix `unit.modules.test_parted` for Windows
 2017-09-08 09:36:59 -04:00
Nicole Thomas
332deeb013 Merge pull request #43401 from twangboy/win_unit_test_pw_group 
Fix `unit.modules.test_pw_group` for Windows
 2017-09-08 09:35:44 -04:00
Nicole Thomas
c0f54bfef1 Merge pull request #43402 from twangboy/win_unit_test_qemu_nbd 
Fix `unit.modules.test_qemu_nbd` for Windows
 2017-09-08 09:34:57 -04:00
Nicole Thomas
be88fbb45f Merge pull request #43404 from twangboy/win_unit_test_seed 
Fix `unit.modules.test_seed` for Windows
 2017-09-08 09:32:40 -04:00
Nicole Thomas
612c6a8756 Merge pull request #43301 from twangboy/win_fix_unit_test_spm 
Fix `unit.test_spm` for Windows
 2017-09-08 09:24:34 -04:00
Alessandro -oggei- Ogier
51c7a1ba00 only check if static_qemu is_executable() 2017-09-08 10:27:29 +02:00
Alessandro -oggei- Ogier
70642e495d better qemu_static parameter mangle in deboostrap management, tests 2017-09-08 10:17:32 +02:00
Jochen Breuer
7431ec64e3
Removed unused sys import 2017-09-08 08:20:14 +02:00
twangboy
6ceb895a84 Use os.path.join for paths 2017-09-07 16:51:10 -06:00
twangboy
f6da23e1aa Properly handle timestamp conversion 2017-09-07 16:33:30 -06:00
twangboy
531ce8022b Fix unit.modules.test_qemu_nbd for Windows 
Use os.sep
 2017-09-07 15:44:35 -06:00
twangboy
78e39a1b9d Fix unit.modules.test_pw_group for Windows 
Skip `test_info` and `test_getent` because they require grp which is not
available on Windows
 2017-09-07 15:34:57 -06:00
twangboy
8e3e897ee2 Fix unit.modules.test_parted for Windows 
Mock salt.utils.is_windows to be False so that the __virtual__ tests
will run
 2017-09-07 15:27:11 -06:00
twangboy
6257aa964a Fix unit.modules.test_pam for Windows 
Mocks os.path.exists
 2017-09-07 15:18:14 -06:00
twangboy
4a8d7e522c Fix tests, Use full path to salt.utils.which 2017-09-07 14:41:56 -06:00
Sergey Kizunov
d82e406f15 Fix loader.py's raw_mod() to look in all module dirs 
Previously, it wasn't looking in module dirs defined via
the `module_dirs` config option. Fix this issue.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-09-07 13:43:11 -05:00
Nicole Thomas
6106aec696 Merge pull request #43356 from gtmanfred/2016.11 
never-download got readded
 2017-09-07 13:46:04 -04:00
Nicole Thomas
f959113694 Merge pull request #43372 from skizunov/develop5 
Fix system.set_system_time when no hw clock is present
 2017-09-07 13:45:32 -04:00
Nicole Thomas
e638fac54e Merge pull request #43325 from doesitblend/salt-mine-doc-fix 
mine_interval option is minutes not seconds
 2017-09-07 12:58:10 -04:00
Nicole Thomas
3f19b247f3 Add handler.messages back in for test comparison 2017-09-07 11:51:39 -04:00
Jochen Breuer
0c71da95f6
Using salt method to identify MS Windows, single instead of double quotes 2017-09-07 15:47:13 +02:00
Nicole Thomas
1e94d0ac3a Lint: Remove trailing whitespace 2017-09-07 09:21:42 -04:00
Jochen Breuer
20619b24c4
Fixed test for delete_deployment 
Due to implementation change, we need to mock the return value.
 2017-09-07 10:20:46 +02:00
Ken Jordan
51af8f8757 Fix mine_interval phrasing in default file 2017-09-06 16:25:53 -06:00
twangboy
a909813fa5 Remove unused import (lint) 2017-09-06 15:56:24 -06:00
Paul Miller
842b07fd25 Prevent spurious "Template does not exist" error 
This was merged previously (though slightly differently) in #39516

Took me a second to track it down and then realized that I fixed this in 2016.x
 2017-09-06 16:18:17 -04:00
Nicole Thomas
6d13535ed0 Merge pull request #43193 from jettero/template-dne-again 
Prevent spurious "Template does not exist" error
 2017-09-06 16:16:57 -04:00
twangboy
3ef8d714cb Fix unit tests to mock salt.utils.path.readlink 2017-09-06 13:03:14 -06:00
twangboy
c0d81aa1ce Use salt.utils.path.readlink 
instead of __salt__['file.readlink']
 2017-09-06 13:03:14 -06:00
twangboy
7c4460164b Fix alternatives for Windows 
Not sure this is necessary... I don't think alternatives is a thing in
Windows. Anyway, it uses `__salt__['file.readlink']` instead of
`os.readlink` as there is no `os.readlink` in Windows.
Modifies the tests to mock `__salt__['file.readlink']` instead of
`os.readlink`
 2017-09-06 13:03:14 -06:00
Nicole Thomas
cde8aed2cf Merge branch '2017.7' into template-dne-again 2017-09-06 14:04:58 -04:00
Sergey Kizunov
281e471853 Fix system.set_system_time when no hw clock is present 
If a hardware clock is not present, then the `cmd.run_all` call in
`has_settable_hwclock` will return a non-zero retcode. If
`ignore_retcode` is not set to True in that call, then it will set
`__context__['retcode']` to that code which will cause the job to
appear as if it failed (due to non-zero retcode) even though it
didn't really fail.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-09-06 11:45:02 -05:00
Nicole Thomas
fc587f784a Merge pull request #43105 from aogier/43086-no-member 
groupadd module: string does not have attribute 'extend', plus homogeneous `cmd` parm building
 2017-09-06 11:49:43 -04:00
Jochen Breuer
91076bbafa Merge branch '2017.7' into improve-async-operation-handling-in-kubernetes-module 2017-09-06 17:06:18 +02:00
Jochen Breuer
7b600e2832
Added pylint-disable statements and import for salt.ext.six.moves.range 2017-09-06 17:03:29 +02:00