diff options
| author |   Simon Rozman <simon@rozman.si> | 2019-02-04 11:45:37 +0100 |
|---|---|---|
| committer |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-02-05 12:59:42 +0100 |
| commit | 963be8e993ae5688f3b0c490813a95391ec98c53 (patch) | |
| tree | f66b410db599c8eb803c5046aed56fdfe1e47bba | |
| parent | Unify certain variable names (diff) | |
| download | wireguard-go-963be8e993ae5688f3b0c490813a95391ec98c53.tar.xz wireguard-go-963be8e993ae5688f3b0c490813a95391ec98c53.zip | |
Stop accessing SetupDiGetDeviceInfoListDetail() output on error
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>
| -rw-r--r-- | setupapi/setupapi_windows_test.go | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/setupapi/setupapi_windows_test.go b/setupapi/setupapi_windows_test.go index 062b6bd..17d6d8e 100644 --- a/setupapi/setupapi_windows_test.go +++ b/setupapi/setupapi_windows_test.go @@ -99,18 +99,18 @@ func TestSetupDiGetDeviceInfoListDetailLocal(t *testing.T) { data, err := SetupDiGetDeviceInfoListDetail(devInfoList) if err != nil { t.Errorf("Error calling SetupDiGetDeviceInfoListDetail: %s", err.Error()) - } - - if data.ClassGUID != deviceClassNetGUID { - t.Error("SetupDiGetDeviceInfoListDetail returned different class GUID") - } + } else { + if data.ClassGUID != deviceClassNetGUID { + t.Error("SetupDiGetDeviceInfoListDetail returned different class GUID") + } - if data.RemoteMachineHandle != windows.Handle(0) { - t.Error("SetupDiGetDeviceInfoListDetail returned non-NULL remote machine handle") - } + if data.RemoteMachineHandle != windows.Handle(0) { + t.Error("SetupDiGetDeviceInfoListDetail returned non-NULL remote machine handle") + } - if data.RemoteMachineName != "" { - 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) if err != nil { t.Errorf("Error calling SetupDiGetDeviceInfoListDetail: %s", err.Error()) - } - - if data.ClassGUID != deviceClassNetGUID { - t.Error("SetupDiGetDeviceInfoListDetail returned different class GUID") - } + } else { + if data.ClassGUID != deviceClassNetGUID { + t.Error("SetupDiGetDeviceInfoListDetail returned different class GUID") + } - if data.RemoteMachineHandle == windows.Handle(0) { - t.Error("SetupDiGetDeviceInfoListDetail returned NULL remote machine handle") - } + if data.RemoteMachineHandle == windows.Handle(0) { + t.Error("SetupDiGetDeviceInfoListDetail returned NULL remote machine handle") + } - if data.RemoteMachineName != computerName { - t.Error("SetupDiGetDeviceInfoListDetail returned different remote machine name") + if data.RemoteMachineName != computerName { + t.Error("SetupDiGetDeviceInfoListDetail returned different remote machine name") + } } } |