]> Cypherpunks repositories - gostls13.git/commitdiff
internal/syscall/windows/registry: adjust TestGetMUIStringValue
authorAlex Brainman <alex.brainman@gmail.com>
Mon, 21 Dec 2015 06:44:58 +0000 (17:44 +1100)
committerRuss Cox <rsc@golang.org>
Wed, 6 Jan 2016 16:13:50 +0000 (16:13 +0000)
Do not check DaylightName if DynamicDaylightTimeDisabled is false.

Fixes #13502

Change-Id: I03e01ec0afdeb0037a5d3ee243674e5a6b559da5
Reviewed-on: https://go-review.googlesource.com/17998
Reviewed-by: Yasuhiro MATSUMOTO <mattn.jp@gmail.com>
Reviewed-by: Russ Cox <rsc@golang.org>
src/internal/syscall/windows/registry/registry_test.go

index f63248cc3aa6288a6471fd53ea5713a6d7f6ff19..a63c42022d159488e33c44dc6ae21c15b04f02ed 100644 (file)
@@ -697,17 +697,19 @@ func TestGetMUIStringValue(t *testing.T) {
        }
        defer timezoneK.Close()
 
-       var tests = []struct {
-               key  registry.Key
+       type testType struct {
                name string
                want string
-       }{
-               {key: timezoneK, name: "MUI_Std", want: syscall.UTF16ToString(dtzi.StandardName[:])},
-               {key: timezoneK, name: "MUI_Dlt", want: syscall.UTF16ToString(dtzi.DaylightName[:])},
+       }
+       var tests = []testType{
+               {"MUI_Std", syscall.UTF16ToString(dtzi.StandardName[:])},
+       }
+       if dtzi.DynamicDaylightTimeDisabled == 0 {
+               tests = append(tests, testType{"MUI_Dlt", syscall.UTF16ToString(dtzi.DaylightName[:])})
        }
 
        for _, test := range tests {
-               got, err := test.key.GetMUIStringValue(test.name)
+               got, err := timezoneK.GetMUIStringValue(test.name)
                if err != nil {
                        t.Error("GetMUIStringValue:", err)
                }