Skip to content

Commit 315fcab

Browse files
authored
Merge pull request #269 from nspcc-dev/intergation-test
2 parents 119b895 + c3bfad4 commit 315fcab

File tree

1 file changed

+3
-21
lines changed

1 file changed

+3
-21
lines changed

cmd/neofs-rest-gw/integration_test.go

+3-21
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ func runLocalTests(ctx context.Context, t *testing.T, key *keys.PrivateKey) {
8989

9090
func runTestInContainer(rootCtx context.Context, t *testing.T, key *keys.PrivateKey) {
9191
versions := []dockerImage{
92+
{image: "nspccdev/neofs-aio", version: "latest"},
9293
{image: "nspccdev/neofs-aio", version: "0.42.1"},
9394
}
9495

@@ -1319,10 +1320,7 @@ func doRequest(t *testing.T, httpClient *http.Client, request *http.Request, exp
13191320
respBody, err := io.ReadAll(resp.Body)
13201321
require.NoError(t, err)
13211322

1322-
if expectedCode != resp.StatusCode {
1323-
fmt.Println("resp", string(respBody))
1324-
}
1325-
require.Equal(t, expectedCode, resp.StatusCode)
1323+
require.Equal(t, expectedCode, resp.StatusCode, "resp: %s", respBody)
13261324

13271325
if model == nil {
13281326
return resp.Header, respBody
@@ -1514,24 +1512,8 @@ func makeAuthTokenRequest(ctx context.Context, t *testing.T, bearers []apiserver
15141512
request.Header.Add(XBearerOwnerID, ownerID.String())
15151513
request.Header.Add(XBearerForAllUsers, strconv.FormatBool(forAllUsers))
15161514

1517-
resp, err := httpClient.Do(request)
1518-
require.NoError(t, err)
1519-
defer func() {
1520-
err := resp.Body.Close()
1521-
require.NoError(t, err)
1522-
}()
1523-
1524-
rr, err := io.ReadAll(resp.Body)
1525-
require.NoError(t, err)
1526-
1527-
if resp.StatusCode != http.StatusOK {
1528-
fmt.Println("auth response", string(rr))
1529-
}
1530-
require.Equal(t, http.StatusOK, resp.StatusCode)
1531-
15321515
var stokenResp []*apiserver.TokenResponse
1533-
err = json.Unmarshal(rr, &stokenResp)
1534-
require.NoError(t, err)
1516+
doRequest(t, httpClient, request, http.StatusOK, &stokenResp)
15351517

15361518
fmt.Println("resp tokens:")
15371519

0 commit comments

Comments
 (0)