Changes from code review to use github.com/shoenig/test package

Signed-off-by: dttung2905 <[email protected]>
hashicorp · Dec 22, 2022 · b4141e7 · b4141e7
1 parent 4ed12c9
commit b4141e7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/command/agent/http.go b/command/agent/http.go
@@ -794,6 +794,8 @@ func parseConsistency(resp http.ResponseWriter, req *http.Request, b *structs.Qu
 
 		if staleQuery || staleVal[0] == "" {
 			b.AllowStale = true
+		} else {
+			b.AllowStale = false
 		}
 	}
 }

diff --git a/command/agent/http_test.go b/command/agent/http_test.go
@@ -479,35 +479,31 @@ func TestParseConsistency(t *testing.T) {
 	var b structs.QueryOptions
 	var resp *httptest.ResponseRecorder
 
-	testCases := [3]string{"/v1/catalog/nodes?stale", "/v1/catalog/nodes?stale=true", "/v1/catalog/nodes?stale=false"}
+	testCases := [2]string{"/v1/catalog/nodes?stale", "/v1/catalog/nodes?stale=true"}
 	for _, url := range testCases {
-		req, err := http.NewRequest("GET",
-			url, nil)
+		req, err := http.NewRequest("GET", url, nil)
 		must.NoError(t, err)
 		resp = httptest.NewRecorder()
 		parseConsistency(resp, req, &b)
-		if !b.AllowStale {
-			t.Fatalf("Bad: %v", b)
-		}
+		must.True(t, b.AllowStale)
 	}
 
-	req, err := http.NewRequest("GET", "/v1/catalog/nodes?stale=random", nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
+	req, err := http.NewRequest("GET", "/v1/catalog/nodes?stale=false", nil)
+	must.Nil(t, err, must.Sprintf("err: %v", err))
+	resp = httptest.NewRecorder()
+	parseConsistency(resp, req, &b)
+	must.True(t, !b.AllowStale)
+
+	req, err = http.NewRequest("GET", "/v1/catalog/nodes?stale=random", nil)
+	must.Nil(t, err, must.Sprintf("err: %v", err))
 	resp = httptest.NewRecorder()
 	parseConsistency(resp, req, &b)
-	if resp.Code != 400 {
-		t.Fatalf("bad code: %v", resp.Code)
-	}
 	must.EqOp(t, resp.Code, 400)
 
 	b = structs.QueryOptions{}
 	req, err = http.NewRequest("GET",
 		"/v1/catalog/nodes?consistent", nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
+	must.Nil(t, err, must.Sprintf("err: %v", err))
 
 	resp = httptest.NewRecorder()
 	parseConsistency(resp, req, &b)