valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
98,586 Commits 24 Branches 182 Tags 341 MiB
314a699519
Commit Graph

9003 Commits

Author SHA1 Message Date
twangboy
314a699519
Ensure proper line ending 2018-10-25 15:31:06 -06:00
twangboy
be6a6ac1a5
Skip test that is missing win32 libraries 2018-10-24 11:43:10 -06:00
twangboy
7e8d21456e
Add tests 2018-10-23 16:17:38 -06:00
rallytime
b9f61323b5
Merge branch '2018.3' into 'fluorine' 
No conflicts.
 2018-10-22 14:41:20 -04:00
Gareth J. Greenaway
8fa87e3dc9
Update test_network.py 2018-10-21 08:39:29 -07:00
Gareth J. Greenaway
311796994b
Fixing scenario where the interface for the default route has a dash in it, regular expression used in get_route currently doesn't not account for this.. Adding some additional tests for network.get_route. 2018-10-20 15:57:25 -07:00
Erik Johnson
c1dd362ce2
Merge remote-tracking branch 'upstream/2018.3' into merge-fluorine 
Conflicts:
- salt/utils/schedule.py
- tests/integration/scheduler/test_eval.py
- tests/integration/scheduler/test_skip.py
- tests/unit/modules/test_yumpkg.py
 2018-10-19 13:56:46 -05:00
Mike Place
dd75897a5e
Merge pull request #50103 from twangboy/mf_49872 
Merge Forward 49872 to Fluorine
 2018-10-19 05:50:11 -06:00
Mike Place
e2c39d7880
Merge pull request #50111 from cbosdo/fluorine-backport 
Fluorine backport of PR #50109
 2018-10-19 05:47:05 -06:00
Mike Place
de23c83f54
Merge pull request #50114 from rallytime/bp-50061 
Back-port #50061 to 2018.3
 2018-10-19 05:46:02 -06:00
Erik Johnson
91812ff510
Squelch spurious errors logged in unit tests 
We are getting errors in the LazyLoader because certain functions are
not present in the LazyDict due to being left out of the whitelist.
These don't cause the tests to fail, but they do result in a lot of
spurious errors in the test suite.
 2018-10-18 14:01:28 -05:00
Erik Johnson
1f09104b0d
Add unit test for pkg.install with epoch 2018-10-18 11:16:58 -04:00
rallytime
c46cccbebf
Remove unused imports 2018-10-18 11:07:24 -04:00
rallytime
82e73fe49d
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - doc/ref/tops/all/index.rst
  - salt/fileclient.py
  - salt/grains/core.py
  - salt/modules/win_file.py
  - salt/pillar/__init__.py
  - salt/utils/http.py
 2018-10-18 10:41:42 -04:00
Cédric Bosdonnat
61937feeb9
test_virt pylint fix 2018-10-18 15:23:33 +02:00
Cédric Bosdonnat
9e61d86303
virt: allow creating or updating VM with no nic or disk 
Some users may want to create a VM with no network interface at all, or
remove all network interfaces from an existing one. This commit allows
this in the virt.init and virt.update functions.

For the sake of consistency, the same behavior has been applied to disks
as well... even though it makes no sense to have a VM with no disk at
all.
 2018-10-18 15:23:24 +02:00
twangboy
223c4f28b3
Merge Forward 49872 to Fluorine 
https://github.com/saltstack/salt/pull/49872
 2018-10-17 16:45:32 -06:00
Nicole Thomas
d0c68df885
Merge pull request #49878 from rallytime/merge-fluorine 
[fluorine] Merge forward from 2018.3 to fluorine
 2018-10-17 13:58:31 -04:00
rallytime
305dc0118d
Add flaky decorator to random_org tests that occassionally fail 2018-10-16 11:14:12 -04:00
Mike Place
f3fe4b67f7
Merge pull request #50064 from rallytime/bp-50022 
Back-port #50022 to 2018.3
 2018-10-16 11:09:46 +02:00
twangboy
cea321f9af
Fix unit.modules.test_virt for Windows 
Fix hard-coded unix-style paths
 2018-10-15 17:16:57 -06:00
Brian Saville
40da3ce2d0
Make test check_pillar more lenient 2018-10-15 16:50:57 -04:00
Erik Johnson
f59506d4cc
Update tests to reflect behavior changes 2018-10-15 10:16:44 -05:00
Nicole Thomas
2d8210c136
Merge pull request #49991 from twangboy/fix_test_thin 
Fix `unit.utils.test_thin` for Windows
 2018-10-15 09:55:32 -04:00
Cédric Bosdonnat
a6a68d66a4
Turn virt.pool_info name parameter optional 
If no name parameter is provided to virt.pool_info, return the infos
for all storage pools. The result of the function has also been enhanced to
return a dict mapping the name of the pool to its infos

(cherry picked from commit 1e48abdfea)
 2018-10-15 08:59:18 +02:00
Cédric Bosdonnat
1f903dd1e0
Turn virt.network_info name parameter optional 
If no name parameter is provided to virt.network_info, return the infos
for all networks. The result of the function has also been enhanced to
return a dict mapping the name of the network to its infos

(cherry picked from commit 3e902384df)
 2018-10-15 08:59:11 +02:00
twangboy
87563aef4e
Fix some lint 2018-10-12 17:25:03 -06:00
Nicole Thomas
58236e4b29
Merge pull request #49953 from twangboy/fix_test_cmdmod 
Fix `unit.modules.test_cmdmod` for Windows
 2018-10-11 14:58:38 -04:00
Nicole Thomas
b32f87685d
Merge pull request #49990 from twangboy/fix_test_status 
Fix `unit.beacons.test_status` for Windows
 2018-10-11 09:20:09 -04:00
Nicole Thomas
1f4374532d
Merge pull request #49960 from twangboy/fix_test_reg 
Fix `unit.states.test_reg` for Windows
 2018-10-11 09:03:48 -04:00
Nicole Thomas
63f7616415
Merge pull request #49951 from twangboy/fix_test_kubernetes 
Fix test `unit.modules.test_kubernetes` on Windows
 2018-10-11 08:57:53 -04:00
twangboy
83451e3417
Fix unit.utils.test_thin for Windows 
Fix py3 compatibility issues
Fix os specific path issues
 2018-10-10 17:22:21 -06:00
twangboy
cb8ee4d17d
Remove unused import 2018-10-10 16:01:19 -06:00
twangboy
0faa53c727
Remove Windows-specific checks 2018-10-10 15:54:14 -06:00
twangboy
476cbc07f0
Fix syntax error 2018-10-10 14:35:09 -06:00
twangboy
da34a9e93a
Fix failing test on Py3 and Linux 2018-10-10 14:33:39 -06:00
twangboy
3de18ec7b8
Fix failing test 
In py3 bytes are actual bytes and you can't join them with strings
So, you have to make sure everything's the same type
I used `.encode()`
 2018-10-10 14:10:10 -06:00
Nicole Thomas
c912d3a288
Merge pull request #49946 from isbm/isbm-osversion_info-fixes 
osversion/osversion_info/osmajorrelease grains fixes
 2018-10-10 10:01:03 -04:00
Nicole Thomas
196675b4df
Merge pull request #49952 from twangboy/fix_test_terraform 
Fix `unit.roster.test_terraform` for Windows
 2018-10-10 09:47:14 -04:00
Nicole Thomas
6279d83b6e
Merge pull request #49956 from twangboy/fix_test_file 
Fix `unit.states.test_file` for Windows
 2018-10-10 09:43:00 -04:00
twangboy
99eeed33c9
Fix unit.states.test_reg for Windows 
Fix failing reg tests
Added new tests
 2018-10-09 17:42:00 -06:00
twangboy
4afbdf2763
Fix unit.utils.test_jinja for Windows 
Fixes `unit.utils.test_jinja` on Windows
- Basically fixes some path seperators
 2018-10-09 15:38:47 -06:00
twangboy
9581427df9
Fix unit.states.test_file for Windows 
Fixes `unit.states.test_file` on Windows
- Fixes path seperators mostly
 2018-10-09 15:19:29 -06:00
twangboy
f0475dd63d
Fix unit.modules.test_cmdmod for Windows 
Fixes the `unit.modules.test_cmdmod` test on Windows.

salt.utils.win_runas
- Returns CommandExecutionError when the users does not exist
- Fixes some spelling

tests.unit.modules.test_cmdmod
- Fixes some linesep issues
- Combines some mocking
 2018-10-09 14:04:16 -06:00
twangboy
e524bef352
Use unicode literals, fix paths 2018-10-09 13:17:33 -06:00
twangboy
7e876d9d24
Use tmp instead of temp for cross platform 2018-10-09 11:47:41 -06:00
twangboy
65284f2254
Fix issue with test for path in Windows 2018-10-09 11:41:59 -06:00
Bo Maryniuk
a17ba35a5b Fix proper part name in the string-bound CPE 2018-10-09 16:37:15 +02:00
Bo Maryniuk
9d4960752e Expand unit test to verify part name 2018-10-09 16:36:53 +02:00
Bo Maryniuk
712083df0e Add unit test for broken CPE_NAME 2018-10-09 14:11:56 +02:00