Consolidate tests (#116)

Consolidates tests into a single integration suite
smartcontractkit · Oct 21, 2021 · 124cb42 · 124cb42
1 parent 8270c6c
commit 124cb42
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 72 deletions.
diff --git a/suite/chaos/suite_test.go → suite/chaos/chaos_suite_test.go b/suite/chaos/suite_test.go → suite/chaos/chaos_suite_test.go
diff --git a/suite/contracts/contracts_cron_test.go → suite/integration/contracts_cron_test.go b/suite/contracts/contracts_cron_test.go → suite/integration/contracts_cron_test.go
@@ -1,4 +1,4 @@
-package contracts
+package integration
 
 import (
 	"fmt"

diff --git a/suite/contracts/contracts_flux_test.go → suite/integration/contracts_flux_test.go b/suite/contracts/contracts_flux_test.go → suite/integration/contracts_flux_test.go
@@ -1,4 +1,4 @@
-package contracts
+package integration
 
 import (
 	"context"

diff --git a/...acts/contracts_flux_validate_flag_test.go → ...tion/contracts_flux_validate_flag_test.go b/...acts/contracts_flux_validate_flag_test.go → ...tion/contracts_flux_validate_flag_test.go
@@ -1,4 +1,4 @@
-package contracts
+package integration
 
 import (
 	"context"

diff --git a/suite/contracts/contracts_keeper_test.go → suite/integration/contracts_keeper_test.go b/suite/contracts/contracts_keeper_test.go → suite/integration/contracts_keeper_test.go
@@ -1,4 +1,4 @@
-package contracts
+package integration
 
 import (
 	"context"

diff --git a/suite/contracts/contracts_ocr_test.go → suite/integration/contracts_ocr_test.go b/suite/contracts/contracts_ocr_test.go → suite/integration/contracts_ocr_test.go
@@ -1,4 +1,4 @@
-package contracts
+package integration
 
 import (
 	. "github.com/onsi/ginkgo"

diff --git a/suite/contracts/contracts_runlog_test.go → suite/integration/contracts_runlog_test.go b/suite/contracts/contracts_runlog_test.go → suite/integration/contracts_runlog_test.go
@@ -1,4 +1,4 @@
-package contracts
+package integration
 
 import (
 	"context"

diff --git a/suite/contracts/contracts_test.go → suite/integration/contracts_test.go b/suite/contracts/contracts_test.go → suite/integration/contracts_test.go
@@ -1,4 +1,4 @@
-package contracts
+package integration
 
 import (
 	"context"

diff --git a/suite/contracts/contracts_vrf_test.go → suite/integration/contracts_vrf_test.go b/suite/contracts/contracts_vrf_test.go → suite/integration/contracts_vrf_test.go
@@ -1,4 +1,4 @@
-package contracts
+package integration
 
 import (
 	"context"

diff --git a/suite/refill/eth_refill_test.go → suite/integration/eth_refill_test.go b/suite/refill/eth_refill_test.go → suite/integration/eth_refill_test.go
@@ -1,4 +1,4 @@
-package refill
+package integration
 
 import (
 	"context"

diff --git a/suite/contracts/contract_suite_test.go → suite/integration/integration_suite_test.go b/suite/contracts/contract_suite_test.go → suite/integration/integration_suite_test.go
@@ -1,4 +1,4 @@
-package contracts_test
+package integration_test
 
 import (
 	"os"
@@ -14,14 +14,14 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-func TestContracts(t *testing.T) {
+func TestIntegration(t *testing.T) {
 	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
 	RegisterFailHandler(Fail)
 	conf, err := config.NewConfig(tools.ProjectRoot)
 	if err != nil {
 		Fail("failed to load config")
 	}
 	log.Logger = log.Logger.Level(zerolog.Level(conf.Logging.Level))
-	junitReporter := reporters.NewJUnitReporter("../../logs/tests-contracts.xml")
-	RunSpecsWithDefaultAndCustomReporters(t, "Contract Suite", []Reporter{junitReporter})
+	junitReporter := reporters.NewJUnitReporter("../../logs/tests-integration.xml")
+	RunSpecsWithDefaultAndCustomReporters(t, "Integration suite", []Reporter{junitReporter})
 }
diff --git a/...i-network/multi_network_contracts_test.go → ...tegration/multi_network_contracts_test.go b/...i-network/multi_network_contracts_test.go → ...tegration/multi_network_contracts_test.go
@@ -1,4 +1,4 @@
-package multi_network
+package integration
 
 import (
 	"context"

diff --git a/suite/multi-network/multi_network_suite_test.go b/suite/multi-network/multi_network_suite_test.go
diff --git a/suite/performance/common.go b/suite/performance/common.go
@@ -2,12 +2,13 @@ package performance
 
 import (
 	"fmt"
+	"sync"
+	"time"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/smartcontractkit/integrations-framework/actions"
-	"golang.org/x/sync/errgroup"
-	"sync"
 	"github.com/smartcontractkit/integrations-framework/client"
-	"time"
+	"golang.org/x/sync/errgroup"
 
 	"github.com/montanaflynn/stats"
 	"github.com/onsi/ginkgo"

diff --git a/suite/performance/suite_test.go → suite/performance/performance_suite_test.go b/suite/performance/suite_test.go → suite/performance/performance_suite_test.go
diff --git a/suite/refill/eth_refill_suite_test.go b/suite/refill/eth_refill_suite_test.go
diff --git a/tools/integration_test.sh b/tools/integration_test.sh
@@ -9,7 +9,7 @@ performance=$1
 
 if [[ $performance == 0 ]]; then
   echo "Running smoke tests"
-  ginkgo -r -keepGoing --trace --randomizeAllSpecs --randomizeSuites --progress -nodes=10 -skipPackage=./suite/performance,./suite/chaos ./suite/...
+  ginkgo -r -keepGoing --trace --randomizeAllSpecs --randomizeSuites --progress -nodes=15 -skipPackage=./suite/performance,./suite/chaos ./suite/...
 else
   echo "Running performance and chaos tests"
   ginkgo -r -keepGoing --trace --randomizeAllSpecs --randomizeSuites --progress ./suite/performance ./suite/chaos