valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
82,768 Commits 24 Branches 182 Tags 341 MiB
791248e398
Commit Graph

2987 Commits

Author SHA1 Message Date
Bo Maryniuk
d834bc2c8b Remove old tester. 2017-06-19 13:57:54 +02:00
Pablo Suárez Hernández
fb444db0f2 Search the entire CACHE_DIR because storage paths change across versions 
Prevents zero length error on Python 2.6

Fixes Zypper unit test

Enhances pkg.list_downloaded information of a package

Listing all patches instead of security ones only

Adapting Zypper test to new list_downloaded output

Fixes zypper test error after backporting

Pylint fixes
 2017-06-16 15:28:42 +02:00
Pablo Suárez Hernández
27ef83fd62 Adding support for installing patches in yum/dnf execution module 
Adding support for installing patches in Zypper module

Adding list_downloaded function to Zypper module

Adding list_downloaded function to Yum module

Adding new pkg.downloaded state

Adding documentation for pkg.downloaded state

Adding pkg.patched and pkg.patch_downloaded states

Check targets for advisory patches installation

Adds support for listing advisory patches with Zypper

Adds support for listing advisory patches with Yum

Improving function naming

Moving advisory ids checks into pkg_resource.parse_targets

Fixes _find_download_targets to call _preflight_check

Fixes parse_targets when advisory id is passed as name

Pylint fixes

Enables pkg.downloaded to verify packages after package manager call.

Adding missing kwargs parameters to pkg.install call

Adding versionadded flags

Some refactoring and minor fixes

Adding unit tests for Zypper execution module

Adding more unit tests for Zypper module

Pylint fix
 2017-06-16 15:28:10 +02:00
Peter V. Saveliev
4761e711fe clean up change attribute from interface dict 
The attribute is hidden in IPDB from the high-level logics since
pyroute2 version 0.4.2.

Bug-Url: https://github.com/saltstack/salt/issues/41461

unit tests: add pyroute2 interface dict test

Bug-Url: https://github.com/saltstack/salt/pull/41487
Bug-Url: https://github.com/saltstack/salt/issues/41461

unit tests: fix absolute imports in test_pyroute2

Bug-Url: https://github.com/saltstack/salt/pull/41533

unit tests: add encoding clause into test_pyroute2

Bug-Url: https://github.com/saltstack/salt/pull/41533

unit tests: test_pyroute2 -- add skipIf

... and comments

Bug-Url: https://github.com/saltstack/salt/pull/41533

Update new pyroute2 unit test to conform with 2016.11 branch standards
 2017-06-16 14:39:08 +02:00
Michael Calmer
f7cd2f6722 Fix os_family case in unittest 2017-06-16 14:39:08 +02:00
Bo Maryniuk
2d8c9883ff Use correct grain constants for timezone 
Adjust the test so it is using the right grain for SUSE systems

Bugfix: use correct grain constant for platform

Refactor with setup/teardown

Add UT for RedHat's set_zone

Fix doc for RH UT

Remove unnecessary mock patch

Doc fix

Add UT for set_zone on SUSE series

Adjust UT to use correct grain for SUSE series

Bugfix: use correct os_family grain value for SUSE series

Add UT for gentoo on set_zone

Add UT for Debian on set_zone

Remove duplicate code

Add UT for get_hwclock on UTC/localtime

Remove dead code

Add UT for get_hwclock on SUSE platform

Bugfix: use correct grain for SUSE and RedHat platform

Add UT for RedHat/SUSE platforms on get_hwclock

Add UT for Debian on get_hwclock

Add UT on Solaris

Add UT for AIX on get_hwclock

Add UT for set_hwclock on AIX

Fix docstrings

Add UT for set_hwclock on solaris

Add UT for set_hwclock on Arch

Add UT for set_hwclock on RedHat

Fix UT names

Add UT set_hwclock on SUSE

Bugfix: use correct grain name for SUSE platform

Add UT for set_hwclock on Debian

Add UT on set_hw_clock on Gentoo

Fix lint issues

Rewrite test case for using no patch decorators

Disable the test for a while

Do not use multiple variables in "with" statement as of lint issues
 2017-06-16 14:39:08 +02:00
rallytime
b6cc0b6bf0 Manually backport the changes in PR #41615 
The automatic back-porting process did't work for this file since the
testing file has been renamed. I manually added the changes to
`timezone_test.py` that were present in PR #41615.
 2017-06-15 08:53:25 -06:00
rallytime
2b51a20d02 Replace "nitrogen" references with 2017.7.0, too! 2017-06-14 12:20:45 -06:00
rallytime
b0145578bf Update Nitrogen references to 2017.7.0 for states, utils, tests directory 
Also updated version.py with release tuple
 2017-06-14 11:54:27 -06:00
Nicole Thomas
832b96ea05 Merge pull request #41614 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-06-06 18:42:44 -06:00
rallytime
8aaadd8787 Revert "Update new pyroute2 unit test to conform with 2016.11 branch standards" 
This reverts commit 535b8e8d8e.
 2017-06-06 16:35:12 -06:00
Ch3LL
ea147701f4
Fix get_hwclock_aix test on MacOSX 2017-06-06 15:06:08 -04:00
rallytime
1a40e105e5 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - tests/integration/__init__.py
  - tests/integration/modules/test_state.py
 2017-06-06 12:57:44 -06:00
rallytime
535b8e8d8e Update new pyroute2 unit test to conform with 2016.11 branch standards 2017-06-05 20:55:44 -06:00
Peter V. Saveliev
5c86dee73c unit tests: test_pyroute2 -- add skipIf 
... and comments

Bug-Url: https://github.com/saltstack/salt/pull/41533
 2017-06-05 17:22:48 -06:00
Peter V. Saveliev
026b39493f unit tests: add encoding clause into test_pyroute2 
Bug-Url: https://github.com/saltstack/salt/pull/41533
 2017-06-05 17:22:48 -06:00
Peter V. Saveliev
9ab203d54b unit tests: fix absolute imports in test_pyroute2 
Bug-Url: https://github.com/saltstack/salt/pull/41533
 2017-06-05 17:22:48 -06:00
Peter V. Saveliev
1f507cfa7a unit tests: add pyroute2 interface dict test 
Bug-Url: https://github.com/saltstack/salt/pull/41487
Bug-Url: https://github.com/saltstack/salt/issues/41461
 2017-06-05 17:22:48 -06:00
Nicole Thomas
a49348cc89 Merge pull request #41535 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-06-01 16:25:35 -06:00
rallytime
cb69296f55 Remove test_win_firewall unit tests: they don't actually test anything 2017-06-01 10:07:23 -06:00
Dmitry Kuzmenko
7ba25db473 Replace assertCountEqual not-implemented in Py2 2017-06-01 16:52:09 +03:00
Dmitry Kuzmenko
64954d8e40 Fixed pylint errors. 2017-06-01 16:49:57 +03:00
Dmitry Kuzmenko
4a2406f178 Py3: fixed some tests. 
tls module: convert bytes to string
gzip util: use BytesIO for 'wb' file
django module: ignore arguments order in assert
pillar module: correctly test pillar merge
 2017-06-01 16:49:57 +03:00
rallytime
63ea033ec3 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/win_status.py
  - salt/states/selinux.py
  - tests/unit/modules/test_ssh.py
 2017-05-31 14:29:12 -06:00
Mike Place
06ed4f077b Merge pull request #41337 from Foxlik/2016.11 
Fix #41335 - list index out of range on empty line in authorized_keys
 2017-05-31 14:59:16 -05:00
Tomas Zvala
916fecb64f modify ssh_test.py, to check empty lines and comments in authorized_keys #41335 2017-05-31 10:56:02 +02:00
rallytime
675937e0ab Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - tests/unit/states/test_keystone.py
 2017-05-30 10:16:14 -06:00
Nicole Thomas
f7411393e4 Merge pull request #41495 from isbm/bp-41405 
Takeover from "rallytime:bp-41405"
 2017-05-30 09:11:43 -06:00
Mike Place
491d4d941a Merge pull request #41430 from DSRCorporation/bugs/py3_tests_nitrogen 
One more bunch of tests fixes.
 2017-05-26 16:53:37 -05:00
Petr Michalec
6db8915021 Endpoint handling per region, fixes #35874 
- extend tests for multiple regions
- region arg by default set to None
- print verbose changes to be exec.
 2017-05-26 11:15:29 -06:00
Bo Maryniuk
fa5c2c1672 Add UT for unsupported operators 2017-05-25 12:55:46 -06:00
Bo Maryniuk
157b83c05a Lintfixes 2017-05-25 12:55:46 -06:00
Bo Maryniuk
43abd345b2 Add UT for operator conditions 2017-05-25 12:55:46 -06:00
Bo Maryniuk
1053daf2d0 Add UT for typecheck on the output data 2017-05-25 12:55:46 -06:00
Bo Maryniuk
5c1259834f Add UT for None type verification if version has been not passed 2017-05-25 12:55:46 -06:00
Bo Maryniuk
0dd27380b1 Add UT for wildcard finder usage 2017-05-25 12:55:46 -06:00
Bo Maryniuk
5e836a2543 Test the exact methods for matcher 2017-05-25 12:55:46 -06:00
Bo Maryniuk
2af4160a1a Add UT for exact match of the pattern at the beginning 2017-05-25 12:55:46 -06:00
Bo Maryniuk
5a2248d254 Add UT for exact match of the pattern at the end 2017-05-25 12:55:46 -06:00
Bo Maryniuk
334c634826 Add UT to match multiple asterisks 2017-05-25 12:55:46 -06:00
Bo Maryniuk
f73b39fd3c Add UT for matching all versions 2017-05-25 12:55:46 -06:00
Bo Maryniuk
a9c3c8bf03 Fix a docstring 2017-05-25 12:55:46 -06:00
Bo Maryniuk
344295666b Rename UT to a proper name 2017-05-25 12:55:46 -06:00
Bo Maryniuk
369b4bf127 Add unit test scaffold for wildcard support 2017-05-25 12:55:46 -06:00
rallytime
ff0def408b Whitespace fix 2017-05-25 10:26:06 -06:00
Dmitry Kuzmenko
7a9b4a92af Fixed syslog-ng test: it passes command as list, not as a string. 2017-05-25 14:33:43 +03:00
Dmitry Kuzmenko
6b0921e5ba Py3 tests fixes: don't mock non-callable objects with return_value. 
mock = MagicMock(return_value='') works for functions: here mock() will
return the value (empty string). But mock returns the MagicMock object.
Not sure why but it worked in Py2, but in Py3 os.path.join(mock,
'something'), for instance, returns an error.

Fixed the issues by avoiding of using mocks where we can use simple
strings.
 2017-05-25 12:33:43 +03:00
rallytime
9ff2694155 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - pkg/salt-minion.service
  - salt/modules/junos.py
  - salt/modules/localemod.py
  - salt/modules/win_system.py
  - salt/states/junos.py
  - tests/unit/modules/test_localemod.py
  - tests/unit/modules/test_win_powercfg.py
  - tests/unit/states/dockerng_test.py
 2017-05-24 16:32:59 -06:00
Mike Place
88fd3c0ed9 Merge pull request #41336 from mcalmer/fix-locale-on-SUSE 
fix setting and getting locale on SUSE systems
 2017-05-24 12:46:07 -05:00
Benjamin Drung
33a7f8b2ec Fix typos 
lintian found several spelling errors.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2017-05-24 12:50:29 +02:00
rallytime
c6c1d30c48 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/yumpkg.py
  - salt/spm/__init__.py
  - tests/unit/modules/test_zypper.py
  - tests/unit/utils/test_network.py
 2017-05-20 17:07:34 -06:00
Michael Calmer
f30f5c8a25 fix unit tests 2017-05-19 13:28:52 +02:00
Mike Place
9f359d841f Merge pull request #41208 from pkazmierczak/pkazmierczak-zypper-multiple-ver-pkgs 
Fix: zypper handling of multiple version packages
 2017-05-18 10:44:26 -05:00
Mike Place
fe38c7cf5e Merge pull request #41282 from mcdermj/bp-41247 
JunOS: Change os_install to use get_file instead of get_template
 2017-05-17 13:25:26 -05:00
Piotr Kaźmierczak
d411a91676 Reverted back to cascading with statements for python 2.6 compat 2017-05-17 11:52:56 +02:00
rallytime
76714d116b Mock calls to salt.utils.pkg.clear_rtag call in aptpkg unit tests 2017-05-16 16:00:37 -06:00
Piotr Kaźmierczak
7204013653 Compacted with statements in the unit test. 2017-05-16 22:48:09 +02:00
Piotr Kaźmierczak
6c4c08042c Added unit tests and copied the behavior to 
.upgrade method, too.
 2017-05-16 20:47:04 +02:00
Jeremy McDermond
3e481cb764 JunOS: Fix whitespace for PEP compliance 2017-05-16 10:00:58 -07:00
Jeremy McDermond
f1751d135a JunOS: Fix Unit Test 
When adding the cp.get_file function, we need to add it into the list of
mock functions in the unit test along with get_template or the unit
tests will fail.
 2017-05-16 10:00:50 -07:00
rallytime
d23010a114 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/aptpkg.py
  - salt/states/libcloud_dns.py
  - salt/states/pkg.py
  - tests/integration/modules/test_pkg.py
  - tests/unit/modules/test_mac_brew.py
  - tests/unit/modules/test_pkgutil.py
  - tests/unit/modules/test_zypper.py
  - tests/unit/states/libcloud_dns_test.py
 2017-05-15 16:41:59 -06:00
Mike Place
50d8fde123 Merge pull request #41101 from terminalmage/issue40940 
Fix "latest" keyword for version specification when used with aggregation
 2017-05-15 11:52:35 -05:00
Dmitry Kuzmenko
b10730d8a1 Py3: Fixed timezone test. 2017-05-15 19:40:57 +03:00
rallytime
9014033726 Use LoaderModuleMockMixin for setting up default grains/salt dunders 2017-05-10 13:49:43 -06:00
rallytime
c282533612 Use with patch.dict for timezone.__grains__ dictionaries 2017-05-10 10:32:24 -06:00
rallytime
baa8e3f5a6 Move new timezone_test.py tests over to test_timezone.py tests 2017-05-09 16:33:18 -06:00
rallytime
ef0df4a954 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/win_network.py
  - salt/modules/win_pkg.py
  - salt/utils/gitfs.py
  - tests/unit/modules/test_win_network.py
  - tests/unit/states/test_file.py
 2017-05-09 14:32:49 -06:00
Mike Place
a2f359fa13 Merge pull request #40852 from isbm/isbm-fix-coregrains-constants-bsc#1032931 
Isbm fix coregrains constants bsc#1032931
 2017-05-09 12:35:45 -06:00
Bo Maryniuk
f3b12a3f5b Do not use multiple variables in "with" statement as of lint issues 2017-05-09 10:17:49 +02:00
Bo Maryniuk
35a8d99934 Disable the test for a while 2017-05-08 13:49:54 +02:00
Bo Maryniuk
76cb1b7150 Rewrite test case for using no patch decorators 2017-05-08 10:41:50 +02:00
Erik Johnson
2af89beb53 Merge pull request #41103 from lorengordon/win.get_route 
Adds a get_route() function to win_network.py
 2017-05-06 01:19:41 -05:00
Erik Johnson
92011dbe5f Fix "latest" keyword for version specification when used with aggregation 
The "latest" keyword was only implemented when both "name" and "version"
were used, and not for "pkgs". But mod_aggregate puts all packages into
a single low chunk, within "pkgs". This means that using aggregation in
conjuntion with the "latest" keyword no longer resolves the latest
version and thus breaks these states.

This fixes the problem by moving the logic for resolving the "latest"
keyword into _find_install_targets(). It also makes some improvements to
the logic we use to ensure only one package DB refresh is performed per
Salt run, by making the pkg.refresh_db functions handle removing the
rtag file, instead of requiring a call to a helper function everywhere
in the pkg state where we might be calling a function that refreshes the
package DB.
 2017-05-06 00:46:06 -05:00
Loren Gordon
93ce5644ea Adds test for win_network.get_route 2017-05-05 17:32:50 -04:00
Mike Place
044e0b2063 Merge pull request #40860 from twangboy/change_broadcast 
Remove dependency on win32gui
 2017-05-02 10:45:51 -06:00
Erik Johnson
26d2f4a52a Do not automatically unmask services to start/restart/etc. them 2017-05-01 16:01:35 -05:00
Mike Place
9d12a614b7
Fix failing test 2017-05-01 11:50:39 -06:00
Pedro Algarvio
e6ee82e7be
The expected error message is different on py2 and py3 2017-04-28 13:36:45 +01:00
Pedro Algarvio
abe608d739
Drop @patch usage 2017-04-28 13:36:42 +01:00
Pedro Algarvio
4b59c351e4
This branch no longer targets py 2.6 2017-04-28 13:33:37 +01:00
Pedro Algarvio
9ffc79ca67
Use tornado HTTPClient directly. 2017-04-28 13:33:35 +01:00
Pedro Algarvio
7480a8e5fb
Check status on setUp not on the module level @skipIf decorator 2017-04-28 13:33:34 +01:00
twangboy
e8d440b543 Mock win32api instead of win32gui 2017-04-26 12:41:13 -06:00
twangboy
fa8f9b55d8 Fix unit test, still mocking SendMessageTimout 2017-04-25 10:13:55 -06:00
Bo Maryniuk
f71af0b625 Fix lint issues 2017-04-24 18:46:27 +02:00
Bo Maryniuk
0e6abb3e37 Add UT on set_hw_clock on Gentoo 2017-04-24 16:08:22 +02:00
Bo Maryniuk
a2b1d4638c Add UT for set_hwclock on Debian 2017-04-24 16:08:22 +02:00
Bo Maryniuk
88e8184702 Add UT set_hwclock on SUSE 2017-04-24 16:08:22 +02:00
Bo Maryniuk
0cd590f927 Fix UT names 2017-04-24 16:08:22 +02:00
Bo Maryniuk
bee94ade63 Add UT for set_hwclock on RedHat 2017-04-24 16:08:22 +02:00
Bo Maryniuk
dfe2610d05 Add UT for set_hwclock on Arch 2017-04-24 16:08:22 +02:00
Bo Maryniuk
d000a8a6f5 Add UT for set_hwclock on solaris 2017-04-24 16:08:22 +02:00
Bo Maryniuk
d2614aedaa Fix docstrings 2017-04-24 16:08:22 +02:00
Bo Maryniuk
6d782191dc Add UT for set_hwclock on AIX 2017-04-24 16:08:22 +02:00
Bo Maryniuk
d303e0dd8a Add UT for AIX on get_hwclock 2017-04-24 16:08:22 +02:00
Bo Maryniuk
86f2d83781 Add UT on Solaris 2017-04-24 16:08:22 +02:00
Bo Maryniuk
c3cafed6d5 Add UT for Debian on get_hwclock 2017-04-24 16:08:22 +02:00
Bo Maryniuk
d337c09357 Add UT for RedHat/SUSE platforms on get_hwclock 2017-04-24 16:08:22 +02:00
Bo Maryniuk
f25dc5c56c Add UT for get_hwclock on SUSE platform 2017-04-24 16:08:22 +02:00
Bo Maryniuk
08e00c865c Remove dead code 2017-04-24 16:08:22 +02:00