Skip to content

Commit a7656ea

Browse files
peterarguepeterargue
authored
Merge pull request #6839 from onflow/petera/split-access-cohort3-integration-tests
[CI] Split access cohort3 tests into 2 groups
2 parents 219660a + 3953304 commit a7656ea

File tree

10 files changed

+16
-9
lines changed

10 files changed

+16
-9
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,9 @@ jobs:
336336
- name: Access Cohort3 Integration Tests
337337
make: make -C integration access-cohort3-tests
338338
runner: ubuntu-latest
339+
- name: Access Cohort4 Integration Tests
340+
make: make -C integration access-cohort4-tests
341+
runner: ubuntu-latest
339342
# test suite has single test which is flaky and needs to be fixed - reminder here to put it back when it's fixed
340343
# - name: BFT (Framework) Integration Tests
341344
# make: make -C integration bft-framework-tests

‎integration/Makefile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ test:
2323
CGO_CFLAGS=$(CRYPTO_FLAG) go test $(if $(VERBOSE),-v,) -coverprofile=$(COVER_PROFILE) $(RACE_FLAG) $(if $(JSON_OUTPUT),-json,) $(if $(NUM_RUNS),-count $(NUM_RUNS),) $(GO_TEST_PACKAGES)
2424

2525
.PHONY: access-tests
26-
access-tests: access-cohort1-tests access-cohort2-tests access-cohort3-tests
26+
access-tests: access-cohort1-tests access-cohort2-tests access-cohort3-tests access-cohort4-tests
2727

2828
.PHONY: access-cohort1-tests
2929
access-cohort1-tests:
@@ -37,6 +37,10 @@ access-cohort2-tests:
3737
access-cohort3-tests:
3838
CGO_CFLAGS=$(CRYPTO_FLAG) go test -failfast $(if $(VERBOSE),-v,) $(RACE_FLAG) $(if $(JSON_OUTPUT),-json,) $(if $(NUM_RUNS),-count $(NUM_RUNS),) ./tests/access/cohort3/...
3939

40+
.PHONY: access-cohort4-tests
41+
access-cohort4-tests:
42+
CGO_CFLAGS=$(CRYPTO_FLAG) go test -failfast $(if $(VERBOSE),-v,) $(RACE_FLAG) $(if $(JSON_OUTPUT),-json,) $(if $(NUM_RUNS),-count $(NUM_RUNS),) ./tests/access/cohort4/...
43+
4044
.PHONY: collection-tests
4145
collection-tests:
4246
CGO_CFLAGS=$(CRYPTO_FLAG) go test -failfast $(if $(VERBOSE),-v,) $(RACE_FLAG) $(if $(JSON_OUTPUT),-json,) $(if $(NUM_RUNS),-count $(NUM_RUNS),) ./tests/collection/...

‎integration/tests/access/cohort3/access_circuit_breaker_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ func (s *AccessCircuitBreakerSuite) TestCircuitBreaker() {
169169
// Try to send the transaction for the second time. It should wait less than a second because the circuit breaker
170170
// is configured to break after the first failure
171171
err = accessClient.SendTransaction(s.ctx, signedTx)
172-
//Here we catch the codes.Unknown error, as this is the one that comes from the Circuit Breaker when the state is Open.
172+
// Here we catch the codes.Unknown error, as this is the one that comes from the Circuit Breaker when the state is Open.
173173
assert.Equal(s.T(), codes.Unknown, status.Code(err))
174174

175175
// Reconnect the collection node

integration/tests/access/cohort3/access_store_tx_error_messages_test.go renamed to integration/tests/access/cohort4/access_store_tx_error_messages_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cohort3
1+
package cohort4
22

33
import (
44
"context"

integration/tests/access/cohort3/access_test.go renamed to integration/tests/access/cohort4/access_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cohort3
1+
package cohort4
22

33
import (
44
"context"

integration/tests/access/cohort3/execution_data_pruning_test.go renamed to integration/tests/access/cohort4/execution_data_pruning_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cohort3
1+
package cohort4
22

33
import (
44
"context"

integration/tests/access/cohort3/grpc_compression_test.go renamed to integration/tests/access/cohort4/grpc_compression_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cohort3
1+
package cohort4
22

33
import (
44
"context"

integration/tests/access/cohort3/grpc_state_stream_test.go renamed to integration/tests/access/cohort4/grpc_state_stream_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cohort3
1+
package cohort4
22

33
import (
44
"bytes"

integration/tests/access/cohort3/grpc_streaming_blocks_test.go renamed to integration/tests/access/cohort4/grpc_streaming_blocks_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cohort3
1+
package cohort4
22

33
import (
44
"context"

integration/tests/access/cohort3/rest_state_stream_test.go renamed to integration/tests/access/cohort4/rest_state_stream_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cohort3
1+
package cohort4
22

33
import (
44
"context"

0 commit comments

Comments
 (0)