Merge branch 'sh-fix-httprs-race-condition' into 'master'

Fix race condition in httprs test

See merge request gitlab-org/gitlab-workhorse!584

changelogs/unreleased/sh-fix-httprs-race-condition.yml

+---
+title: Fix race condition in httprs test
+merge_request: 584
+author:
+type: fixed

internal/httprs/httprs_test.go

@@ -111,7 +111,6 @@ func TestHttpWebServer(t *testing.T) {
 		So(err, ShouldBeNil)
 
 		server := httptest.NewServer(http.FileServer(http.Dir(dir)))
-		So(server, ShouldNotBeNil)
 
 		Convey("When requesting /file", func() {
 			res, err := http.Get(server.URL + "/file")