From 0195a29399946210700bc5dca2d55c75d80ef9ff Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 22 Oct 2019 22:39:30 +0200 Subject: [PATCH] internal/syscall/windows/registry: fix strict assumptions in TestWalkFullRegistry It turns out that Windows has "legitimate" keys that have bogus type values or bogus lengths that don't correspond with their type. On up to date Windows 10 systems, this test always fails for this reason. So, this commit alters the test to simply log the discrepancy and move on. Fixes #35084 Change-Id: I56e12cc62aff49cfcc38ff01a19dfe53153976a0 Reviewed-on: https://go-review.googlesource.com/c/go/+/202678 Run-TryBot: Jason A. Donenfeld TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick --- src/internal/syscall/windows/registry/registry_test.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/internal/syscall/windows/registry/registry_test.go b/src/internal/syscall/windows/registry/registry_test.go index c77329cb1e..9c75e57889 100644 --- a/src/internal/syscall/windows/registry/registry_test.go +++ b/src/internal/syscall/windows/registry/registry_test.go @@ -551,7 +551,9 @@ func walkKey(t *testing.T, k registry.Key, kname string) { case registry.DWORD, registry.QWORD: _, _, err := k.GetIntegerValue(name) if err != nil { - t.Error(err) + // Sometimes legitimate keys have the wrong sizes, which don't correspond with + // their required size, due to Windows bugs. + t.Logf("warning: GetIntegerValue for type %d of %s of %s failed: %v", valtype, name, kname, err) } case registry.BINARY: _, _, err := k.GetBinaryValue(name) @@ -566,7 +568,8 @@ func walkKey(t *testing.T, k registry.Key, kname string) { case registry.FULL_RESOURCE_DESCRIPTOR, registry.RESOURCE_LIST, registry.RESOURCE_REQUIREMENTS_LIST: // TODO: not implemented default: - t.Fatalf("value type %d of %s of %s failed: %v", valtype, name, kname, err) + // Sometimes legitimate keys have the wrong value type, due to Windows bugs. + t.Logf("warning: value type %d of %s of %s failed: %v", valtype, name, kname, err) } } -- 2.50.0