From a691df2353b77a223c3140221903a123a5128c1e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 6 Jun 2024 10:26:18 +0200 Subject: [PATCH] osbuild-worker-executor: fix order of `assert.Equal()` in tests The `assert.Equal()` expects that the "expected" value is put first. Which is not what I'm used to. It's also slightly inconsistent because `assert.EqualError()` expects the "actual" err first and then the expected string. But this commit is not about ranting :) This commit fixes the order in the tests assert.Equal() so that mismatches actually are displayed correctly. --- .../handler_build_test.go | 22 +++++++++---------- .../handler_result_test.go | 2 +- .../handler_root_test.go | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cmd/osbuild-worker-executor/handler_build_test.go b/cmd/osbuild-worker-executor/handler_build_test.go index c89558bcb3..3025061633 100644 --- a/cmd/osbuild-worker-executor/handler_build_test.go +++ b/cmd/osbuild-worker-executor/handler_build_test.go @@ -25,8 +25,8 @@ func TestBuildMustPOST(t *testing.T) { rsp, err := http.Get(endpoint) assert.NoError(t, err) defer rsp.Body.Close() - assert.Equal(t, rsp.StatusCode, 405) - assert.Equal(t, loggerHook.LastEntry().Message, "handlerBuild called on /api/v1/build") + assert.Equal(t, 405, rsp.StatusCode) + assert.Equal(t, "handlerBuild called on /api/v1/build", loggerHook.LastEntry().Message) } func writeToTar(atar *tar.Writer, name, content string) error { @@ -49,10 +49,10 @@ func TestBuildChecksContentType(t *testing.T) { rsp, err := http.Post(endpoint, "random/encoding", nil) assert.NoError(t, err) defer rsp.Body.Close() - assert.Equal(t, rsp.StatusCode, http.StatusUnsupportedMediaType) + assert.Equal(t, http.StatusUnsupportedMediaType, rsp.StatusCode) body, err := io.ReadAll(rsp.Body) assert.NoError(t, err) - assert.Equal(t, string(body), "Content-Type must be [application/x-tar], got random/encoding\n") + assert.Equal(t, "Content-Type must be [application/x-tar], got random/encoding\n", string(body)) } func makeTestPost(t *testing.T, controlJSON, manifestJSON string) *bytes.Buffer { @@ -105,7 +105,7 @@ echo "fake-build-result" > %[1]s/build/output/image/disk.img defer func() { _, _ = io.ReadAll(rsp.Body) }() defer rsp.Body.Close() - assert.Equal(t, rsp.StatusCode, http.StatusCreated) + assert.Equal(t, http.StatusCreated, rsp.StatusCode) reader := bufio.NewReader(rsp.Body) // check that we get the output of osbuild streamed to us @@ -114,7 +114,7 @@ echo "fake-build-result" > %[1]s/build/output/image/disk.img {"fake": "manifest"}`, baseBuildDir) content, err := io.ReadAll(reader) assert.NoError(t, err) - assert.Equal(t, string(content), expectedContent) + assert.Equal(t, expectedContent, string(content)) // check log too logFileContent, err := os.ReadFile(filepath.Join(baseBuildDir, "build/build.log")) assert.NoError(t, err) @@ -164,7 +164,7 @@ echo "fake-build-result" > %[1]s/build/output/image/disk.img buf := makeTestPost(t, `{"exports": ["tree"]}`, `{"fake": "manifest"}`) rsp, err := http.Post(endpoint, "application/x-tar", buf) assert.NoError(t, err) - assert.Equal(t, rsp.StatusCode, http.StatusCreated) + assert.Equal(t, http.StatusCreated, rsp.StatusCode) defer func() { _, _ = io.ReadAll(rsp.Body) }() defer rsp.Body.Close() @@ -172,8 +172,8 @@ echo "fake-build-result" > %[1]s/build/output/image/disk.img rsp, err = http.Post(endpoint, "application/x-tar", buf) assert.NoError(t, err) defer rsp.Body.Close() - assert.Equal(t, rsp.StatusCode, http.StatusConflict) - assert.Equal(t, loggerHook.LastEntry().Message, main.ErrAlreadyBuilding.Error()) + assert.Equal(t, http.StatusConflict, rsp.StatusCode) + assert.Equal(t, main.ErrAlreadyBuilding.Error(), loggerHook.LastEntry().Message) } func TestHandleIncludedSourcesUnclean(t *testing.T) { @@ -236,7 +236,7 @@ exit 23 defer func() { _, _ = io.ReadAll(rsp.Body) }() defer rsp.Body.Close() - assert.Equal(t, rsp.StatusCode, http.StatusCreated) + assert.Equal(t, http.StatusCreated, rsp.StatusCode) reader := bufio.NewReader(rsp.Body) content, err := io.ReadAll(reader) assert.NoError(t, err) @@ -280,7 +280,7 @@ echo "fake-build-result" > %[1]s/build/output/image/disk.img defer func() { _, _ = io.ReadAll(rsp.Body) }() defer rsp.Body.Close() - assert.Equal(t, rsp.StatusCode, http.StatusCreated) + assert.Equal(t, http.StatusCreated, rsp.StatusCode) reader := bufio.NewReader(rsp.Body) var lineno, seconds, nano int64 diff --git a/cmd/osbuild-worker-executor/handler_result_test.go b/cmd/osbuild-worker-executor/handler_result_test.go index ccc75a893e..287c563aae 100644 --- a/cmd/osbuild-worker-executor/handler_result_test.go +++ b/cmd/osbuild-worker-executor/handler_result_test.go @@ -16,7 +16,7 @@ func TestResultTooEarly(t *testing.T) { rsp, err := http.Get(endpoint) assert.NoError(t, err) - assert.Equal(t, rsp.StatusCode, http.StatusTooEarly) + assert.Equal(t, http.StatusTooEarly, rsp.StatusCode) } func TestResultBad(t *testing.T) { diff --git a/cmd/osbuild-worker-executor/handler_root_test.go b/cmd/osbuild-worker-executor/handler_root_test.go index da62002380..6a0737d3ea 100644 --- a/cmd/osbuild-worker-executor/handler_root_test.go +++ b/cmd/osbuild-worker-executor/handler_root_test.go @@ -13,6 +13,6 @@ func TestTrivialRootEndpoint(t *testing.T) { endpoint := baseURL resp, err := http.Get(endpoint) assert.NoError(t, err) - assert.Equal(t, resp.StatusCode, 200) - assert.Equal(t, loggerHook.LastEntry().Message, "/ handler called") + assert.Equal(t, 200, resp.StatusCode) + assert.Equal(t, "/ handler called", loggerHook.LastEntry().Message) }