Mike Place
49f93cb091
Merge pull request #41405 from isbm/isbm-zypper-wildcards-dev
...
Wildcards for Zypper
2017-05-24 11:57:42 -05: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
Tom Williams
3eebfb7e73
INFRA-4842 - /thought/ I fixed this :)
2017-05-23 12:04:19 -04: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
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
Bo Maryniuk
2a60eae826
Add unit test for hostname can be started from 127
2017-05-16 16:21:31 +02:00
Bo Maryniuk
5168ef8959
Add unit test for hostname can be started from 127
2017-05-16 16:18:14 +02:00
Bo Maryniuk
1b28c67047
Add unit test for utilising host name as "127"
2017-05-16 12:17:13 +02:00
Bo Maryniuk
d9c8324a6b
Unit test for accepting hosts names as 127
2017-05-16 12:07:32 +02:00
Jeremy McDermond
7cdf7b3546
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-15 16:12:19 -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
rallytime
bde9d6cdc0
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-05-15 16:29:13 -06:00