snow/wireguard-go
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Stop accessing SetupDiGetDeviceInfoListDetail() output on error

Browse source 
The data returned by SetupDiGetDeviceInfoListDetail() is nil on error
which will cause the test to crash should the function fail.

Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2019-02-04 11:45:37 +01:00 committed by Jason A. Donenfeld
parent e821cdabd2
commit 963be8e993
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
setupapi/setupapi_windows_test.go
View file

@ -99,18 +99,18 @@ func TestSetupDiGetDeviceInfoListDetailLocal(t *testing.T) {
data, err := SetupDiGetDeviceInfoListDetail(devInfoList) data, err := SetupDiGetDeviceInfoListDetail(devInfoList)
if err != nil { if err != nil {
t.Errorf("Error calling SetupDiGetDeviceInfoListDetail: %s", err.Error()) t.Errorf("Error calling SetupDiGetDeviceInfoListDetail: %s", err.Error())
} } else {
if data.ClassGUID != deviceClassNetGUID {
t.Error("SetupDiGetDeviceInfoListDetail returned different class GUID")
}
if data.ClassGUID != deviceClassNetGUID { if data.RemoteMachineHandle != windows.Handle(0) {
t.Error("SetupDiGetDeviceInfoListDetail returned different class GUID") t.Error("SetupDiGetDeviceInfoListDetail returned non-NULL remote machine handle")
} }
if data.RemoteMachineHandle != windows.Handle(0) { if data.RemoteMachineName != "" {
t.Error("SetupDiGetDeviceInfoListDetail returned non-NULL remote machine handle") t.Error("SetupDiGetDeviceInfoListDetail returned non-NULL remote machine name")
} }
if data.RemoteMachineName != "" {
t.Error("SetupDiGetDeviceInfoListDetail returned non-NULL remote machine name")
} }
} }
@ -124,18 +124,18 @@ func TestSetupDiGetDeviceInfoListDetailRemote(t *testing.T) {
data, err := SetupDiGetDeviceInfoListDetail(devInfoList) data, err := SetupDiGetDeviceInfoListDetail(devInfoList)
if err != nil { if err != nil {
t.Errorf("Error calling SetupDiGetDeviceInfoListDetail: %s", err.Error()) t.Errorf("Error calling SetupDiGetDeviceInfoListDetail: %s", err.Error())
} } else {
if data.ClassGUID != deviceClassNetGUID {
t.Error("SetupDiGetDeviceInfoListDetail returned different class GUID")
}
if data.ClassGUID != deviceClassNetGUID { if data.RemoteMachineHandle == windows.Handle(0) {
t.Error("SetupDiGetDeviceInfoListDetail returned different class GUID") t.Error("SetupDiGetDeviceInfoListDetail returned NULL remote machine handle")
} }
if data.RemoteMachineHandle == windows.Handle(0) { if data.RemoteMachineName != computerName {
t.Error("SetupDiGetDeviceInfoListDetail returned NULL remote machine handle") t.Error("SetupDiGetDeviceInfoListDetail returned different remote machine name")
} }
if data.RemoteMachineName != computerName {
t.Error("SetupDiGetDeviceInfoListDetail returned different remote machine name")
} }
} }