From 00390b208c4b3b261d080812cc0c98ea26156847 Mon Sep 17 00:00:00 2001
From: Michael Erickson <michae2@cockroachlabs.com>
Date: Fri, 17 Jun 2022 11:26:06 -0700
Subject: [PATCH] roachtest: remove superfluous nil check to make nogo happy

A recent change to roachtest was causing nogo to complain:

```
compilepkg: nogo: errors found by nogo during build-time code analysis:
pkg/cmd/roachtest/test_runner.go:369:11: tautological condition: non-nil != nil (nilness)
```

Release note: None
---
 pkg/cmd/roachtest/test_runner.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/cmd/roachtest/test_runner.go b/pkg/cmd/roachtest/test_runner.go
index d35b5e6c0b26..da43397c66d1 100644
--- a/pkg/cmd/roachtest/test_runner.go
+++ b/pkg/cmd/roachtest/test_runner.go
@@ -366,7 +366,7 @@ func defaultClusterAllocator(
 			if err == nil {
 				return c, nil
 			}
-			if err != nil && !errors.Is(err, errClusterNotFound) {
+			if !errors.Is(err, errClusterNotFound) {
 				return nil, err
 			}
 			// Fall through to create new cluster with name override.