From 0a92922092b21ff6097f5e152130b634b35a4674 Mon Sep 17 00:00:00 2001 From: Heschi Kreinick Date: Mon, 26 Jun 2023 12:46:44 -0400 Subject: [PATCH] windows: make TestSystemModuleVersions more tolerant One file can't be read on LUCI's Windows image: syscall_windows_test.go:892: CimFS.SYS: The specified resource type cannot be found in the image file. That doesn't seem like a good enough reason to fail the test. Skip the file if this error is encountered. Change-Id: Id9a65b3ff748bbf7ef7fac37d3741c16e001a4b0 Reviewed-on: https://go-review.googlesource.com/c/sys/+/505220 TryBot-Result: Gopher Robot Reviewed-by: Carlos Amedee Run-TryBot: Heschi Kreinick Auto-Submit: Heschi Kreinick Reviewed-by: Quim Muntal --- windows/syscall_windows_test.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/windows/syscall_windows_test.go b/windows/syscall_windows_test.go index 81050d337..012944153 100644 --- a/windows/syscall_windows_test.go +++ b/windows/syscall_windows_test.go @@ -888,22 +888,21 @@ func TestSystemModuleVersions(t *testing.T) { var zero windows.Handle infoSize, err := windows.GetFileVersionInfoSize(driverPath, &zero) if err != nil { - if err != windows.ERROR_FILE_NOT_FOUND { - t.Error(err) + if err != windows.ERROR_FILE_NOT_FOUND && err != windows.ERROR_RESOURCE_TYPE_NOT_FOUND { + t.Errorf("%v: %v", moduleName, err) } continue } versionInfo := make([]byte, infoSize) - err = windows.GetFileVersionInfo(driverPath, 0, infoSize, unsafe.Pointer(&versionInfo[0])) - if err != nil && err != windows.ERROR_FILE_NOT_FOUND { - t.Error(err) + if err = windows.GetFileVersionInfo(driverPath, 0, infoSize, unsafe.Pointer(&versionInfo[0])); err != nil { + t.Errorf("%v: %v", moduleName, err) continue } var fixedInfo *windows.VS_FIXEDFILEINFO fixedInfoLen := uint32(unsafe.Sizeof(*fixedInfo)) err = windows.VerQueryValue(unsafe.Pointer(&versionInfo[0]), `\`, (unsafe.Pointer)(&fixedInfo), &fixedInfoLen) if err != nil { - t.Error(err) + t.Errorf("%v: %v", moduleName, err) continue } t.Logf("%s: v%d.%d.%d.%d", moduleName,