Merge pull request #6839 from onflow/petera/split-access-cohort3-inte…

…gration-tests

[CI] Split access cohort3 tests into 2 groups

.github/workflows/ci.yml

@@ -336,6 +336,9 @@ jobs:
           - name: Access Cohort3 Integration Tests
             make: make -C integration access-cohort3-tests
             runner: ubuntu-latest
+          - name: Access Cohort4 Integration Tests
+            make: make -C integration access-cohort4-tests
+            runner: ubuntu-latest
             # test suite has single test which is flaky and needs to be fixed - reminder here to put it back when it's fixed
 #          - name: BFT (Framework) Integration Tests
 #            make: make -C integration bft-framework-tests

integration/Makefile

@@ -23,7 +23,7 @@ test:
 	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)
 
 .PHONY: access-tests
-access-tests: access-cohort1-tests access-cohort2-tests access-cohort3-tests
+access-tests: access-cohort1-tests access-cohort2-tests access-cohort3-tests access-cohort4-tests
 
 .PHONY: access-cohort1-tests
 access-cohort1-tests:
@@ -37,6 +37,10 @@ access-cohort2-tests:
 access-cohort3-tests:
 	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/...
 
+.PHONY: access-cohort4-tests
+access-cohort4-tests:
+	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/...
+
 .PHONY: collection-tests
 collection-tests:
 	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

@@ -169,7 +169,7 @@ func (s *AccessCircuitBreakerSuite) TestCircuitBreaker() {
 	// Try to send the transaction for the second time. It should wait less than a second because the circuit breaker
 	// is configured to break after the first failure
 	err = accessClient.SendTransaction(s.ctx, signedTx)
-	//Here we catch the codes.Unknown error, as this is the one that comes from the Circuit Breaker when the state is Open.
+	// Here we catch the codes.Unknown error, as this is the one that comes from the Circuit Breaker when the state is Open.
 	assert.Equal(s.T(), codes.Unknown, status.Code(err))
 
 	// Reconnect the collection node

integration/tests/access/cohort3/access_store_tx_error_messages_test.go → integration/tests/access/cohort4/access_store_tx_error_messages_test.go

@@ -1,4 +1,4 @@
-package cohort3
+package cohort4
 
 import (
 	"context"

integration/tests/access/cohort3/access_test.go → integration/tests/access/cohort4/access_test.go

@@ -1,4 +1,4 @@
-package cohort3
+package cohort4
 
 import (
 	"context"

integration/tests/access/cohort3/execution_data_pruning_test.go → integration/tests/access/cohort4/execution_data_pruning_test.go

@@ -1,4 +1,4 @@
-package cohort3
+package cohort4
 
 import (
 	"context"

integration/tests/access/cohort3/grpc_compression_test.go → integration/tests/access/cohort4/grpc_compression_test.go

@@ -1,4 +1,4 @@
-package cohort3
+package cohort4
 
 import (
 	"context"

integration/tests/access/cohort3/grpc_state_stream_test.go → integration/tests/access/cohort4/grpc_state_stream_test.go

@@ -1,4 +1,4 @@
-package cohort3
+package cohort4
 
 import (
 	"bytes"

integration/tests/access/cohort3/grpc_streaming_blocks_test.go → integration/tests/access/cohort4/grpc_streaming_blocks_test.go

@@ -1,4 +1,4 @@
-package cohort3
+package cohort4
 
 import (
 	"context"

integration/tests/access/cohort3/rest_state_stream_test.go → integration/tests/access/cohort4/rest_state_stream_test.go

@@ -1,4 +1,4 @@
-package cohort3
+package cohort4
 
 import (
 	"context"