Commit Graph

76890 Commits

Author SHA1 Message Date
Bo Maryniuk
d337c09357 Add UT for RedHat/SUSE platforms on get_hwclock 2017-04-24 16:08:22 +02:00
Bo Maryniuk
501a59ca7e Bugfix: use correct grain for SUSE and RedHat platform 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
Bo Maryniuk
1216a0bf12 Add UT for get_hwclock on UTC/localtime 2017-04-24 16:08:22 +02:00
Bo Maryniuk
39332c71d3 Remove duplicate code 2017-04-24 16:08:22 +02:00
Bo Maryniuk
58676c568d Add UT for Debian on set_zone 2017-04-24 16:08:22 +02:00
Bo Maryniuk
1b9ce37b1b Add UT for gentoo on set_zone 2017-04-24 16:08:22 +02:00
Bo Maryniuk
cf7f766a68 Bugfix: use correct os_family grain value for SUSE series 2017-04-24 16:08:22 +02:00
Bo Maryniuk
6ed9be985e Adjust UT to use correct grain for SUSE series 2017-04-24 16:08:22 +02:00
Bo Maryniuk
ce4c836a60 Add UT for set_zone on SUSE series 2017-04-24 16:08:22 +02:00
Bo Maryniuk
155a498b49 Doc fix 2017-04-24 16:08:22 +02:00
Bo Maryniuk
a40876cdac Remove unnecessary mock patch 2017-04-24 16:08:22 +02:00
Bo Maryniuk
ffab2db213 Fix doc for RH UT 2017-04-24 16:08:22 +02:00
Bo Maryniuk
72388f7ae2 Add UT for RedHat's set_zone 2017-04-24 16:08:22 +02:00
Bo Maryniuk
11595d3a42 Refactor with setup/teardown 2017-04-24 16:08:22 +02:00
Bo Maryniuk
ce6a06de98 Bugfix: use correct grain constant for platform 2017-04-24 16:08:22 +02:00
Bo Maryniuk
28072c9e41 Adjust the test so it is using the right grain for SUSE systems 2017-04-24 16:08:22 +02:00
Bo Maryniuk
7a0e4be4f8 Add unit test for get_zone and various platforms 2017-04-24 16:08:22 +02:00
Mike Place
25b62aee47 Merge pull request #40817 from isbm/isbm-skip-false-values-from-preferred-ip-201611
Some UT for cloud
2017-04-23 04:01:40 -06:00
Bo Maryniuk
7c5714b90b Describe debug information 2017-04-22 10:45:21 +02:00
Bo Maryniuk
e0210ff8cb Reformat idents, fix typos 2017-04-22 10:45:08 +02:00
Bo Maryniuk
fb777e3f3e PEP8: fix unused variable 2017-04-22 10:44:20 +02:00
Bo Maryniuk
b2e85de85d Fix lint, typos and readability 2017-04-22 10:19:05 +02:00
Bo Maryniuk
116c96a4b7 Fix UT parameter changes 2017-04-22 10:08:20 +02:00
Bo Maryniuk
61558f08e7 Lintfix E0602 2017-04-22 10:08:20 +02:00
Bo Maryniuk
ed84420df0 Add unit test for node ip filtering 2017-04-22 10:08:20 +02:00
Bo Maryniuk
82582cff77 Skip test, if libcloud is not around 2017-04-22 10:08:20 +02:00
Bo Maryniuk
f005d53c56 Fix name error exception 2017-04-22 10:08:20 +02:00
Bo Maryniuk
b668e60b4c Move out nested function for testing purposes 2017-04-22 10:08:19 +02:00
Bo Maryniuk
5e574a24d9 Add unit test for nova connector 2017-04-22 10:08:19 +02:00
Bo Maryniuk
181d0780d0 Lintfix 2017-04-22 10:08:19 +02:00
Bo Maryniuk
8e9ce1a68d Move out nested function to be unit-testable 2017-04-22 10:08:19 +02:00
Bo Maryniuk
cd43805770 Add initial unit test for openstack cloud module 2017-04-22 10:08:19 +02:00
Bo Maryniuk
177f31446d Add fake preferred IP function for testing 2017-04-22 10:08:19 +02:00
Bo Maryniuk
d1aeb13ac7 Move out openstack's nested function to be testable 2017-04-22 10:03:46 +02:00
Nicole Thomas
50ddf219a6 Merge pull request #40824 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-04-21 14:03:10 -06:00
Mike Place
d6e26d18cb Merge pull request #40811 from UtahDave/2016.11local
get config_dir based off conf_file if __opts__['config_dir'] doesn't exist
2017-04-21 11:44:41 -06:00
Mike Place
ddedf05b7d Merge pull request #40820 from gtmanfred/2016.11
remove deprecated firstgen rackspace cloud driver
2017-04-21 11:42:18 -06:00
rallytime
f31f9512b8 Merge branch '2016.3' into '2016.11'
No conflicts.
2017-04-21 09:51:31 -06:00
Daniel Wallace
b60a8d013a remove rackspace from index 2017-04-21 09:23:05 -06:00
Daniel Wallace
559aa1d8b6 remove deprecated firstgen rackspace cloud driver 2017-04-21 08:59:56 -06:00
David Boucha
9f6e2e9c92 get config_dir based off conf_file
get config_dir based off conf_file if config_dir not in __opts__

ZD 1353
2017-04-20 17:20:19 -06:00
Nicole Thomas
2ab42489df Merge pull request #40797 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-04-20 13:42:03 -06:00
Nicole Thomas
ced839f841 Merge pull request #40800 from rallytime/bp-40720
Back-port #40720 to 2016.11
2017-04-20 13:41:40 -06:00
Ken Crowell
6c0124ae21 Call tornado.httputil.url_concat compatibly
See https://github.com/tornadoweb/tornado/pull/1899.
2017-04-20 11:37:20 -06:00
rallytime
22500a7261 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/utils/s3.py
2017-04-20 11:18:43 -06:00
Mike Place
3b9ebeb98f Merge pull request #40754 from lordcirth/fix-uppercase-checksums
file.manage_file: uppercase checksums now work
2017-04-20 11:17:49 -06:00
Mike Place
5388ffa7a2 Merge pull request #40785 from alexproca/backport-winexec-selection
win_pkg: backport 2016.11 add msiexec override to enable selection of 32 or 64 msiexec.exe
2017-04-20 10:45:13 -06:00
Mike Place
623e2eb61f Merge pull request #40791 from a-powell/s3-util-get-memory-fix
S3 util get memory fix
2017-04-20 10:32:26 -06:00