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
82,267 Commits 24 Branches 182 Tags 341 MiB
57166fd892
Commit Graph

5858 Commits

Author SHA1 Message Date
rallytime
57166fd892 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-24 15:30:44 -06:00
Nicole Thomas
a924806d6e Merge pull request #41411 from rallytime/fix-haproxyconn-tests 
Fix haproxyconn unit test failures
 2017-05-24 13:01:29 -06:00
Mike Place
4678b5cb84 Merge pull request #41386 from grahamhayes/unit-tests-40905 
Add unit test for PR #40905
 2017-05-24 12:02:13 -05:00
Mike Place
49f93cb091 Merge pull request #41405 from isbm/isbm-zypper-wildcards-dev 
Wildcards for Zypper
 2017-05-24 11:57:42 -05:00
rallytime
68c277e5f7 Fix haproxyconn unit test failures 
Too many arguments were being passed into the test function

This change removes the extra "mock" arg and the tests pass.

This issue was introduced in PR #40713

Fixes https://github.com/saltstack/salt-jenkins/issues/357
 2017-05-24 10:41:38 -06:00
Mike Place
d578aa9f68 Merge pull request #41332 from bodhi-space/infra4842 
INFRA-4842 - boto_elb should return None when test=True and changes are pending
 2017-05-24 11:24:47 -05:00
Bo Maryniuk
22732504a3 Add UT for unsupported operators 2017-05-24 16:29:59 +02:00
Bo Maryniuk
a579ffc166 Lintfixes 2017-05-24 15:19:39 +02:00
Bo Maryniuk
3d40688cd9 Add UT for operator conditions 2017-05-24 13:55:49 +02:00
Bo Maryniuk
0bf0950158 Add UT for typecheck on the output data 2017-05-24 13:55:49 +02:00
Bo Maryniuk
20ff494b93 Add UT for None type verification if version has been not passed 2017-05-24 13:55:49 +02:00
Bo Maryniuk
c806128d51 Add UT for wildcard finder usage 2017-05-24 13:55:49 +02:00
Bo Maryniuk
552b3265d0 Test the exact methods for matcher 2017-05-24 13:55:49 +02:00
Bo Maryniuk
561ae0b8c8 Add UT for exact match of the pattern at the beginning 2017-05-24 13:55:49 +02:00
Bo Maryniuk
b1ddcccda0 Add UT for exact match of the pattern at the end 2017-05-24 13:55:49 +02:00
Bo Maryniuk
4c9dd39118 Add UT to match multiple asterisks 2017-05-24 13:55:49 +02:00
Bo Maryniuk
8839f7219b Add UT for matching all versions 2017-05-24 13:55:49 +02:00
Bo Maryniuk
5988e3b5d3 Fix a docstring 2017-05-24 13:55:49 +02:00
Bo Maryniuk
508c439b2b Rename UT to a proper name 2017-05-24 13:55:49 +02:00
Bo Maryniuk
3b44018f58 Add unit test scaffold for wildcard support 2017-05-24 13:55:49 +02: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
Tom Williams
3eebfb7e73 INFRA-4842 - /thought/ I fixed this :) 2017-05-23 12:04:19 -04:00
Graham Hayes
44b7ecf45f
Add unit test for PR #40905 
This ensures we do not introduce a regression which breaks
the usage of the `batch` option when using states in orchestration
runners.

Related to #40635 and #39169
 2017-05-23 16:23:17 +01:00
rallytime
718b0adc70 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/modules/zypper.py
  - tests/unit/utils/test_network.py
 2017-05-23 09:05:13 -06:00
Tom Williams
7d519a4533 INFRA-4842 - fixup unit tests to suit 2017-05-22 23:26:03 -04:00
Mike Place
b43b89c5fa Merge pull request #40713 from pgstenberg/feature-haproxyconnaddfunc 
Additional functionality to the haproxy module
 2017-05-22 12:11:32 -05:00
Mike Place
1ba95684a9 Merge pull request #41113 from cro/proxy_auto_test2 
Rescue proxy_auto_tests PR from git rebase hell
 2017-05-22 12:05:07 -05: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
Mike Place
ebd8376ef4 Merge pull request #41328 from jpautler/dev/jpautler/hwclock_nilinuxrt_support 
Update timezone get/set_hwclock for NILinuxRT systems
 2017-05-19 13:04:21 -05:00
Tom Williams
dcadf12d4d INFRA-4842 - update unit test to account for new test=True result 2017-05-18 18:04:01 -04: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
Jeffrey Pautler
6254b8f326 Update set_hwclock to only accept UTC on NILinuxRT 
NILinuxRT systems do not support non-UTC timezones for hwclock, so
enforce that in set_hwclock.
 2017-05-17 16:44:44 -05:00
Mike Place
4ed45d9dcc Merge pull request #41281 from alexbleotu/root_dir_prepend_fix-gh 
Root dir prepend fix gh #2
 2017-05-17 14:10:26 -05:00
Mike Place
9d9bf1c7f6 Merge pull request #41247 from mcdermj/develop 
JunOS: Change os_install to use get_file instead of get_template
 2017-05-17 13:46:15 -05:00
Mike Place
1c1e092f56 Merge pull request #41269 from isbm/isbm-minion-id-127-name 
Bugfix: Unable to use "127" as hostname for the Minion ID
 2017-05-17 13:31:15 -05:00
Mike Place
c51a6e4757 Merge pull request #41270 from isbm/isbm-minion-id-127-name-devel 
Bugfix: Unable to use "127" as hostname for the Minion ID (devel)
 2017-05-17 13:29:03 -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
Mike Place
1d89454fd8 Merge pull request #41285 from kraney/boto_lambda_vpc_reset 
fix a bug in boto_lambda state where if VpcConfig is None or absent, …
 2017-05-17 11:55:58 -05:00
Alexandru Bleotu
513254678f Fixed tests in test_api to not have a side-effect of changing the salt.config.DEFAULT_API_OPTS array 2017-05-17 17:21:15 +01:00
Alexandru Bleotu
4737b0d4fd Added test to prevent errors when the config root path includes the default root path 2017-05-17 17:21:15 +01:00
Piotr Kaźmierczak
d411a91676 Reverted back to cascading with statements for python 2.6 compat 2017-05-17 11:52:56 +02:00
Bo Maryniuk
5f01e748e0 Fix Lint 2017-05-17 08:42:38 +02:00
rallytime
9668480fc5 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-16 19:58:21 -06:00
Winston Liu
a96e431717 fixed unit test failures. 2017-05-16 15:09:00 -07: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
Jeremy McDermond
40eef0c0e3 JunOS: Fix whitespace for PEP compliance 2017-05-16 08:21:16 -07:00