Skip to content

Commit 0a92922

Browse files
heschigopherbot
authored andcommitted
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 <gobot@golang.org> Reviewed-by: Carlos Amedee <carlos@golang.org> Run-TryBot: Heschi Kreinick <heschi@google.com> Auto-Submit: Heschi Kreinick <heschi@google.com> Reviewed-by: Quim Muntal <quimmuntal@gmail.com>
1 parent d1abdad commit 0a92922

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

windows/syscall_windows_test.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -888,22 +888,21 @@ func TestSystemModuleVersions(t *testing.T) {
888888
var zero windows.Handle
889889
infoSize, err := windows.GetFileVersionInfoSize(driverPath, &zero)
890890
if err != nil {
891-
if err != windows.ERROR_FILE_NOT_FOUND {
892-
t.Error(err)
891+
if err != windows.ERROR_FILE_NOT_FOUND && err != windows.ERROR_RESOURCE_TYPE_NOT_FOUND {
892+
t.Errorf("%v: %v", moduleName, err)
893893
}
894894
continue
895895
}
896896
versionInfo := make([]byte, infoSize)
897-
err = windows.GetFileVersionInfo(driverPath, 0, infoSize, unsafe.Pointer(&versionInfo[0]))
898-
if err != nil && err != windows.ERROR_FILE_NOT_FOUND {
899-
t.Error(err)
897+
if err = windows.GetFileVersionInfo(driverPath, 0, infoSize, unsafe.Pointer(&versionInfo[0])); err != nil {
898+
t.Errorf("%v: %v", moduleName, err)
900899
continue
901900
}
902901
var fixedInfo *windows.VS_FIXEDFILEINFO
903902
fixedInfoLen := uint32(unsafe.Sizeof(*fixedInfo))
904903
err = windows.VerQueryValue(unsafe.Pointer(&versionInfo[0]), `\`, (unsafe.Pointer)(&fixedInfo), &fixedInfoLen)
905904
if err != nil {
906-
t.Error(err)
905+
t.Errorf("%v: %v", moduleName, err)
907906
continue
908907
}
909908
t.Logf("%s: v%d.%d.%d.%d", moduleName,

0 commit comments

Comments
 (0)