valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
91,672 Commits 24 Branches 182 Tags 341 MiB
6636f63c15
Commit Graph

7770 Commits

Author SHA1 Message Date
Gareth J. Greenaway
6636f63c15
Initial addition of some unit tests for gpg module. 2018-03-05 14:53:59 -08:00
Nicole Thomas
a3ad308457
Merge pull request #46263 from terminalmage/issue46212 
Add setopt support to yumpkg (and pkg.installed state)
 2018-03-05 14:43:19 -05:00
Nicole Thomas
6bb0a310f9
Merge pull request #46304 from garethgreenaway/quick_fix_scheduler_unit_tests 
[develop] quick fix to unit.utils.test_schedule.ScheduleTestCase.test_eval_schedule_time_eval
 2018-03-05 14:40:26 -05:00
Nicole Thomas
8ec1c6699b
Merge branch 'develop' into state.exists 2018-03-05 10:38:21 -05:00
Nicole Thomas
de308848f9
Merge pull request #46321 from amendlik/pkgng-upgrade 
Account for output variations in pkgng._parse_upgrade
 2018-03-05 10:30:16 -05:00
Adam Mendlik
26322e990a
Account for output variations in pkgng._parse_upgrade 2018-03-03 11:48:10 -07:00
Ronald van Zantvoort
47f82c6f39
Merge branch 'develop' into docker-prune 2018-03-03 18:52:30 +01:00
Erik Johnson
e8b940242c
Add unit test for docker.prune 2018-03-03 01:47:00 -06:00
Gareth J. Greenaway
15ca7a21c2
Fixing merge conflict. 2018-03-02 14:20:32 -08:00
rallytime
ed46ce3c74
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/auth/ldap.py
  - salt/modules/zfs.py
  - salt/modules/zpool.py
  - salt/states/cmd.py
  - salt/utils/schedule.py
  - tests/integration/scheduler/test_eval.py
  - tests/integration/scheduler/test_postpone.py
  - tests/unit/grains/test_core.py
 2018-03-02 11:55:06 -05:00
Gareth J. Greenaway
dcc5deaea5
Porting #46084 to Develop 2018-03-01 16:02:21 -08:00
Nicole Thomas
7382654c70
Merge pull request #46227 from Ch3LL/smtp_file_client 
Mock file_client call in smtp return test
 2018-02-28 17:12:22 -05:00
Erik Johnson
17e454bf04
Add setopt support to yumpkg (and pkg.insalled state) 2018-02-28 14:10:45 -06:00
Nicole Thomas
123625213e
Merge pull request #46232 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-02-28 14:16:36 -05:00
Nicole Thomas
687575b582
Merge pull request #46238 from terminalmage/fds-in-fopen 
Don't allow salt.utils.files.fopen() to open stdin/stdout/stderr
 2018-02-28 14:08:22 -05:00
rallytime
04f24c1794
Lint: fix from a bad merge 
The TestJinjaDefaultOptions test class ended up with the TestCustomExtensions
class definition. This changes the bad merge back to the TestCase class.
 2018-02-28 09:18:27 -05:00
Erik Johnson
fe1527a3c4
Don't allow salt.utils.files.fopen() to open stdin/stdout/stderr 
It's like crossing the streams. h/t @garethgreenaway
 2018-02-27 18:39:54 -06:00
rallytime
aad61c77bd
Update old utils paths to new paths 2018-02-27 17:20:45 -05:00
rallytime
7243baf2c0
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/topics/orchestrate/orchestrate_runner.rst
  - salt/grains/core.py
  - salt/modules/git.py
  - salt/pillar/ec2_pillar.py
  - salt/runner.py
  - salt/utils/ssh.py
  - tests/integration/modules/test_cp.py
  - tests/unit/grains/test_core.py
  - tests/unit/modules/test_file.py
  - tests/unit/modules/test_git.py
 2018-02-27 17:13:28 -05:00
twangboy
415821eee9
Fix encoding issue 2018-02-27 14:38:07 -07:00
Ch3LL
280dc9a2b6
Mock file_client call in smtp return test 2018-02-27 16:36:38 -05:00
Nicole Thomas
7f326c0c17
Merge pull request #46204 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-02-27 10:22:52 -05:00
rallytime
379e33cb3c
Lint fix: remove unused import 2018-02-27 10:14:35 -05:00
rallytime
6927642321
Merge branch '2018.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - salt/modules/cmdmod.py
  - salt/utils/schedule.py
  - tests/integration/scheduler/test_eval.py
 2018-02-26 14:23:06 -05:00
Dmitry Kuzmenko
21673ea4eb
Postgress module unit test fix. 2018-02-26 21:50:13 +03:00
Nicole Thomas
6c67741544
Merge pull request #45855 from sjorge/zfsutils 
zfs/zpool refactor
 2018-02-26 11:50:33 -05:00
rallytime
776f2ea5d7
Merge branch '2018.3.0rc1' into '2018.3' 
Conflicts:
  - salt/pillar/file_tree.py
  - tests/unit/modules/test_yumpkg.py
 2018-02-26 11:01:42 -05:00
Benjamin Drung
0b445f2a37 tests: Add unit tests for _parse_os_release() 
Add tests cases to fully cover _parse_os_release().

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-26 13:38:23 +01:00
Benjamin Drung
f6069b77ed Fix osfinger grain on Debian 
Rework _run_os_grains_tests() to check all os grains including osfinger.
Fix osfinger on Debian (e.g. use "Debian-9" instead of
"Debian GNU/Linux-9").

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-26 13:36:33 +01:00
Benjamin Drung
8dde55a761 tests: Add os_grains test cases for Debian 
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-26 13:36:33 +01:00
Benjamin Drung
ff02ab9937 tests: Add Ubuntu 17.10 (artful) os_grains test case 
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-26 13:36:33 +01:00
Benjamin Drung
77d5356aba Fix incorrect oscodename grain on Ubuntu 
Use the full content of /etc/os-release for the Ubuntu 16.04 (artful)
os_grains test case. This reveals a bug that 'oscodename' is not
correctly calculated if /etc/os-release provides PRETTY_NAME:

FAIL: test_ubuntu_os_grains (tests.unit.grains.test_core.CoreGrainsTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/grains/test_core.py", line 439, in test_ubuntu_os_grains
    self._run_ubuntu_os_grains_tests(_os_release_map)
  File "tests/unit/grains/test_core.py", line 446, in _run_ubuntu_os_grains_tests
    self._run_os_grains_tests(os_release_map)
  File "tests/unit/grains/test_core.py", line 262, in _run_os_grains_tests
    self.assertEqual(os_grains.get('oscodename'), os_release_map['oscodename'])
AssertionError: 'Ubuntu 16.04.3 LTS' != 'xenial'
- Ubuntu 16.04.3 LTS
+ xenial

fixes #34423 for Ubuntu
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-26 13:36:33 +01:00
Benjamin Drung
7e62dc9fd2 tests: Support reading os-release files from disk 
Instead of storing pre-parsed os-release files, add support for reading
os-release files from disk.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-26 13:36:33 +01:00
Benjamin Drung
a92ec0db1b Make _parse_os_release() always callable 
To simplify running unit tests against os_data(), make the
_parse_os_release() function always callable to avoid needing to mock
os.path.isfile().

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-26 13:36:33 +01:00
Benjamin Drung
eee1fe5b38 tests: Dissolve _run_ubuntu_os_grains_tests 
_run_ubuntu_os_grains_tests is only used once and does not provide any
useful abstraction since the introduction of _run_os_grains_tests.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-26 13:36:33 +01:00
Benjamin Drung
1d6ef731fe tests: Deduplicate _run_os_grains_tests() 
_run_suse_os_grains_tests() and _run_ubuntu_os_grains_tests() share most
of their logic. Combine the common part in _run_os_grains_tests() and
let the remaining small parts live in their origin functions.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-26 13:36:33 +01:00
Simon Dodsley
b0403be0fa Add module for Pure Storage FlashBlade array 2018-02-24 09:03:38 -05:00
Jorge Schrauwen
dd29778ed5 Phase 3 - Cleanup tests 2018-02-24 13:37:43 +01:00
Jorge Schrauwen
8517e876e4 Phase 2 - salt.states.zfs tests 2018-02-24 13:37:43 +01:00
sjorge@acheron.be
f4bcf5fa71 Phase 2 - salt.states.zpool tests 2018-02-24 13:37:43 +01:00
Super-User
fce3920b07 Phase 1 - salt.modules.zpool tests 2018-02-24 13:37:42 +01:00
Super-User
e7e902662b Phase 1 - salt.modules.zfs tests 2018-02-24 13:37:42 +01:00
Super-User
7b32faa0ce Phase 0 - salt.utils.zfs tests 2018-02-24 13:37:42 +01:00
rallytime
69ac94baca
Update utils paths 2018-02-24 06:55:09 -05:00
rallytime
cffbf52c10
Lint fix: remove extra line 2018-02-24 06:51:25 -05:00
Nicole Thomas
705caa8cca
Merge pull request #46148 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2017.7.3 to 2017.7
 2018-02-23 14:21:38 -05:00
rallytime
79bed6cff1
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/reg.py
  - salt/modules/win_lgpo.py
  - salt/modules/win_path.py
  - salt/modules/win_pkg.py
  - salt/pillar/file_tree.py
  - salt/states/boto3_route53.py
  - salt/states/reg.py
  - salt/utils/win_functions.py
  - tests/unit/modules/test_kubernetes.py
  - tests/unit/modules/test_win_path.py
 2018-02-23 09:50:19 -05:00
Nicole Thomas
e6374bf68d
Merge pull request #46149 from rallytime/bp-46145 
Back-port #46145 to oxygen.rc1
 2018-02-22 16:57:51 -05:00
Jasper Lievisse Adriaanse
a973b70d64
add execution module for OpenBSD Packet Filter 2018-02-22 21:08:35 +01:00
rallytime
29468f3dce
Lint fixes 2018-02-22 14:18:28 -05:00