Skip to content

Commit b305d73

Browse files
NutsaBNutsaB
committed
fix integration tests
1 parent d7d0a98 commit b305d73

File tree

7 files changed

+87
-93
lines changed

7 files changed

+87
-93
lines changed

‎test/integration/config_apply_test.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,57 +23,57 @@ const (
2323

2424
func TestGrpc_ConfigApply(t *testing.T) {
2525
ctx := context.Background()
26-
teardownTest := setupConnectionTest(t, false, false)
26+
teardownTest := SetupConnectionTest(t, false, false)
2727
defer teardownTest(t)
2828

29-
nginxInstanceID := verifyConnection(t, 2)
29+
nginxInstanceID := VerifyConnection(t, 2)
3030

31-
responses := getManagementPlaneResponses(t, 1)
31+
responses := GetManagementPlaneResponses(t, 1)
3232
assert.Equal(t, mpi.CommandResponse_COMMAND_STATUS_OK, responses[0].GetCommandResponse().GetStatus())
3333
assert.Equal(t, "Successfully updated all files", responses[0].GetCommandResponse().GetMessage())
3434

3535
t.Run("Test 1: No config changes", func(t *testing.T) {
36-
clearManagementPlaneResponses(t)
37-
performConfigApply(t, nginxInstanceID)
38-
responses = getManagementPlaneResponses(t, 1)
36+
ClearManagementPlaneResponses(t)
37+
PerformConfigApply(t, nginxInstanceID)
38+
responses = GetManagementPlaneResponses(t, 1)
3939
t.Logf("Config apply responses: %v", responses)
4040

4141
assert.Equal(t, mpi.CommandResponse_COMMAND_STATUS_OK, responses[0].GetCommandResponse().GetStatus())
4242
assert.Equal(t, "Config apply successful, no files to change", responses[0].GetCommandResponse().GetMessage())
4343
})
4444

4545
t.Run("Test 2: Valid config", func(t *testing.T) {
46-
clearManagementPlaneResponses(t)
47-
err := mockManagementPlaneGrpcContainer.CopyFileToContainer(
46+
ClearManagementPlaneResponses(t)
47+
err := MockManagementPlaneGrpcContainer.CopyFileToContainer(
4848
ctx,
4949
"../config/nginx/nginx-with-test-location.conf",
5050
fmt.Sprintf("/mock-management-plane-grpc/config/%s/etc/nginx/nginx.conf", nginxInstanceID),
5151
0o666,
5252
)
5353
require.NoError(t, err)
5454

55-
performConfigApply(t, nginxInstanceID)
55+
PerformConfigApply(t, nginxInstanceID)
5656

57-
responses = getManagementPlaneResponses(t, 1)
57+
responses = GetManagementPlaneResponses(t, 1)
5858
t.Logf("Config apply responses: %v", responses)
5959

6060
assert.Equal(t, mpi.CommandResponse_COMMAND_STATUS_OK, responses[0].GetCommandResponse().GetStatus())
6161
assert.Equal(t, "Config apply successful", responses[0].GetCommandResponse().GetMessage())
6262
})
6363

6464
t.Run("Test 3: Invalid config", func(t *testing.T) {
65-
clearManagementPlaneResponses(t)
66-
err := mockManagementPlaneGrpcContainer.CopyFileToContainer(
65+
ClearManagementPlaneResponses(t)
66+
err := MockManagementPlaneGrpcContainer.CopyFileToContainer(
6767
ctx,
6868
"../config/nginx/invalid-nginx.conf",
6969
fmt.Sprintf("/mock-management-plane-grpc/config/%s/etc/nginx/nginx.conf", nginxInstanceID),
7070
0o666,
7171
)
7272
require.NoError(t, err)
7373

74-
performConfigApply(t, nginxInstanceID)
74+
PerformConfigApply(t, nginxInstanceID)
7575

76-
responses = getManagementPlaneResponses(t, 2)
76+
responses = GetManagementPlaneResponses(t, 2)
7777
t.Logf("Config apply responses: %v", responses)
7878

7979
assert.Equal(t, mpi.CommandResponse_COMMAND_STATUS_ERROR, responses[0].GetCommandResponse().GetStatus())
@@ -85,10 +85,10 @@ func TestGrpc_ConfigApply(t *testing.T) {
8585
})
8686

8787
t.Run("Test 4: File not in allowed directory", func(t *testing.T) {
88-
clearManagementPlaneResponses(t)
89-
performInvalidConfigApply(t, nginxInstanceID)
88+
ClearManagementPlaneResponses(t)
89+
PerformInvalidConfigApply(t, nginxInstanceID)
9090

91-
responses = getManagementPlaneResponses(t, 1)
91+
responses = GetManagementPlaneResponses(t, 1)
9292
t.Logf("Config apply responses: %v", responses)
9393

9494
assert.Equal(t, mpi.CommandResponse_COMMAND_STATUS_FAILURE, responses[0].GetCommandResponse().GetStatus())

‎test/integration/config_apply_utils.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,31 @@ import (
1717
)
1818

1919
const (
20-
retryCount = 5
21-
retryWaitTime = 4 * time.Second
22-
retryMaxWaitTime = 5 * time.Second
20+
RetryCount = 5
21+
RetryWaitTime = 4 * time.Second
22+
RetryMaxWaitTime = 5 * time.Second
2323
)
2424

25-
var mockManagementPlaneAPIAddress string
25+
var MockManagementPlaneAPIAddress string
2626

27-
func performConfigApply(t *testing.T, nginxInstanceID string) {
27+
func PerformConfigApply(t *testing.T, nginxInstanceID string) {
2828
t.Helper()
2929

3030
client := resty.New()
31-
client.SetRetryCount(retryCount).SetRetryWaitTime(retryWaitTime).SetRetryMaxWaitTime(retryMaxWaitTime)
31+
client.SetRetryCount(RetryCount).SetRetryWaitTime(RetryWaitTime).SetRetryMaxWaitTime(RetryMaxWaitTime)
3232

33-
url := fmt.Sprintf("http://%s/api/v1/instance/%s/config/apply", mockManagementPlaneAPIAddress, nginxInstanceID)
33+
url := fmt.Sprintf("http://%s/api/v1/instance/%s/config/apply", MockManagementPlaneAPIAddress, nginxInstanceID)
3434
resp, err := client.R().EnableTrace().Post(url)
3535

3636
require.NoError(t, err)
3737
assert.Equal(t, http.StatusOK, resp.StatusCode())
3838
}
3939

40-
func performInvalidConfigApply(t *testing.T, nginxInstanceID string) {
40+
func PerformInvalidConfigApply(t *testing.T, nginxInstanceID string) {
4141
t.Helper()
4242

4343
client := resty.New()
44-
client.SetRetryCount(retryCount).SetRetryWaitTime(retryWaitTime).SetRetryMaxWaitTime(retryMaxWaitTime)
44+
client.SetRetryCount(RetryCount).SetRetryWaitTime(RetryWaitTime).SetRetryMaxWaitTime(RetryMaxWaitTime)
4545

4646
body := fmt.Sprintf(`{
4747
"message_meta": {
@@ -78,7 +78,7 @@ func performInvalidConfigApply(t *testing.T, nginxInstanceID string) {
7878
}
7979
}
8080
}`, nginxInstanceID)
81-
url := fmt.Sprintf("http://%s/api/v1/requests", mockManagementPlaneAPIAddress)
81+
url := fmt.Sprintf("http://%s/api/v1/requests", MockManagementPlaneAPIAddress)
8282
resp, err := client.R().EnableTrace().SetBody(body).Post(url)
8383
require.NoError(t, err)
8484
assert.Equal(t, http.StatusOK, resp.StatusCode())

‎test/integration/config_upload_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ import (
1717
)
1818

1919
func TestGrpc_ConfigUpload(t *testing.T) {
20-
teardownTest := setupConnectionTest(t, true, false)
20+
teardownTest := SetupConnectionTest(t, true, false)
2121
defer teardownTest(t)
2222

23-
nginxInstanceID := verifyConnection(t, 2)
23+
nginxInstanceID := VerifyConnection(t, 2)
2424
assert.False(t, t.Failed())
2525

26-
responses := getManagementPlaneResponses(t, 1)
26+
responses := GetManagementPlaneResponses(t, 1)
2727

2828
assert.Equal(t, mpi.CommandResponse_COMMAND_STATUS_OK, responses[0].GetCommandResponse().GetStatus())
2929
assert.Equal(t, "Successfully updated all files", responses[0].GetCommandResponse().GetMessage())
@@ -46,15 +46,15 @@ func TestGrpc_ConfigUpload(t *testing.T) {
4646
t.Logf("Sending config upload request: %s", request)
4747

4848
client := resty.New()
49-
client.SetRetryCount(retryCount).SetRetryWaitTime(retryWaitTime).SetRetryMaxWaitTime(retryMaxWaitTime)
49+
client.SetRetryCount(RetryCount).SetRetryWaitTime(RetryWaitTime).SetRetryMaxWaitTime(RetryMaxWaitTime)
5050

51-
url := fmt.Sprintf("http://%s/api/v1/requests", mockManagementPlaneAPIAddress)
51+
url := fmt.Sprintf("http://%s/api/v1/requests", MockManagementPlaneAPIAddress)
5252
resp, err := client.R().EnableTrace().SetBody(request).Post(url)
5353

5454
require.NoError(t, err)
5555
assert.Equal(t, http.StatusOK, resp.StatusCode())
5656

57-
responses = getManagementPlaneResponses(t, 2)
57+
responses = GetManagementPlaneResponses(t, 2)
5858

5959
assert.Equal(t, mpi.CommandResponse_COMMAND_STATUS_OK, responses[0].GetCommandResponse().GetStatus())
6060
assert.Equal(t, "Successfully updated all files", responses[0].GetCommandResponse().GetMessage())

‎test/integration/file_watcher_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,25 @@ import (
1616

1717
func TestGrpc_FileWatcher(t *testing.T) {
1818
ctx := context.Background()
19-
teardownTest := setupConnectionTest(t, true, false)
19+
teardownTest := SetupConnectionTest(t, true, false)
2020
defer teardownTest(t)
2121

22-
verifyConnection(t, 2)
22+
VerifyConnection(t, 2)
2323
assert.False(t, t.Failed())
2424

25-
err := container.CopyFileToContainer(
25+
err := Container.CopyFileToContainer(
2626
ctx,
2727
"../config/nginx/nginx-with-server-block-access-log.conf",
2828
"/etc/nginx/nginx.conf",
2929
0o666,
3030
)
3131
require.NoError(t, err)
3232

33-
responses := getManagementPlaneResponses(t, 2)
33+
responses := GetManagementPlaneResponses(t, 2)
3434
assert.Equal(t, mpi.CommandResponse_COMMAND_STATUS_OK, responses[0].GetCommandResponse().GetStatus())
3535
assert.Equal(t, "Successfully updated all files", responses[0].GetCommandResponse().GetMessage())
3636
assert.Equal(t, mpi.CommandResponse_COMMAND_STATUS_OK, responses[1].GetCommandResponse().GetStatus())
3737
assert.Equal(t, "Successfully updated all files", responses[1].GetCommandResponse().GetMessage())
3838

39-
verifyUpdateDataPlaneStatus(t)
39+
VerifyUpdateDataPlaneStatus(t)
4040
}

‎test/integration/grpc_management_plane_api_test.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,47 +21,47 @@ import (
2121

2222
func TestGrpc_Reconnection(t *testing.T) {
2323
ctx := context.Background()
24-
teardownTest := setupConnectionTest(t, false, false)
24+
teardownTest := SetupConnectionTest(t, false, false)
2525
defer teardownTest(t)
2626

2727
timeout := 15 * time.Second
2828

29-
originalID := verifyConnection(t, 2)
29+
originalID := VerifyConnection(t, 2)
3030

31-
stopErr := mockManagementPlaneGrpcContainer.Stop(ctx, &timeout)
31+
stopErr := MockManagementPlaneGrpcContainer.Stop(ctx, &timeout)
3232

3333
require.NoError(t, stopErr)
3434

35-
startErr := mockManagementPlaneGrpcContainer.Start(ctx)
35+
startErr := MockManagementPlaneGrpcContainer.Start(ctx)
3636
require.NoError(t, startErr)
3737

38-
ipAddress, err := mockManagementPlaneGrpcContainer.Host(ctx)
38+
ipAddress, err := MockManagementPlaneGrpcContainer.Host(ctx)
3939
require.NoError(t, err)
40-
ports, err := mockManagementPlaneGrpcContainer.Ports(ctx)
40+
ports, err := MockManagementPlaneGrpcContainer.Ports(ctx)
4141
require.NoError(t, err)
42-
mockManagementPlaneAPIAddress = net.JoinHostPort(ipAddress, ports["9093/tcp"][0].HostPort)
42+
MockManagementPlaneAPIAddress = net.JoinHostPort(ipAddress, ports["9093/tcp"][0].HostPort)
4343

44-
currentID := verifyConnection(t, 2)
44+
currentID := VerifyConnection(t, 2)
4545
assert.Equal(t, originalID, currentID)
4646
}
4747

4848
// Verify that the agent sends a connection request and an update data plane status request
4949
func TestGrpc_StartUp(t *testing.T) {
50-
teardownTest := setupConnectionTest(t, true, false)
50+
teardownTest := SetupConnectionTest(t, true, false)
5151
defer teardownTest(t)
5252

53-
verifyConnection(t, 2)
53+
VerifyConnection(t, 2)
5454
assert.False(t, t.Failed())
55-
verifyUpdateDataPlaneHealth(t)
55+
VerifyUpdateDataPlaneHealth(t)
5656
}
5757

5858
func TestGrpc_DataplaneHealthRequest(t *testing.T) {
59-
teardownTest := setupConnectionTest(t, true, false)
59+
teardownTest := SetupConnectionTest(t, true, false)
6060
defer teardownTest(t)
6161

62-
verifyConnection(t, 2)
62+
VerifyConnection(t, 2)
6363

64-
responses := getManagementPlaneResponses(t, 1)
64+
responses := GetManagementPlaneResponses(t, 1)
6565
assert.Equal(t, mpi.CommandResponse_COMMAND_STATUS_OK, responses[0].GetCommandResponse().GetStatus())
6666
assert.Equal(t, "Successfully updated all files", responses[0].GetCommandResponse().GetMessage())
6767

@@ -77,15 +77,15 @@ func TestGrpc_DataplaneHealthRequest(t *testing.T) {
7777
}`
7878

7979
client := resty.New()
80-
client.SetRetryCount(retryCount).SetRetryWaitTime(retryWaitTime).SetRetryMaxWaitTime(retryMaxWaitTime)
80+
client.SetRetryCount(RetryCount).SetRetryWaitTime(RetryWaitTime).SetRetryMaxWaitTime(RetryMaxWaitTime)
8181

82-
url := fmt.Sprintf("http://%s/api/v1/requests", mockManagementPlaneAPIAddress)
82+
url := fmt.Sprintf("http://%s/api/v1/requests", MockManagementPlaneAPIAddress)
8383
resp, err := client.R().EnableTrace().SetBody(request).Post(url)
8484

8585
require.NoError(t, err)
8686
assert.Equal(t, http.StatusOK, resp.StatusCode())
8787

88-
responses = getManagementPlaneResponses(t, 2)
88+
responses = GetManagementPlaneResponses(t, 2)
8989

9090
assert.Equal(t, mpi.CommandResponse_COMMAND_STATUS_OK, responses[1].GetCommandResponse().GetStatus())
9191
assert.Equal(t, "Successfully sent the health status update", responses[1].GetCommandResponse().GetMessage())

0 commit comments

Comments
 (0)