From 3b722c132e682d55aabd9042b40048faeac83f6f Mon Sep 17 00:00:00 2001 From: Taka Goto Date: Thu, 1 Nov 2018 10:24:03 -0500 Subject: [PATCH 1/2] integration tests hits self hosted parity kovan node: --- Makefile | 2 +- .../integration_tests/integration_tests_suite_test.go | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index de7cfa8f..681f34b3 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ test: | $(GINKGO) $(LINT) integrationtest: | $(GINKGO) $(LINT) go vet ./... go fmt ./... - $(GINKGO) -r --flakeAttempts=20 pkg/transformers/integration_tests/ integration_test/ + $(GINKGO) -r pkg/transformers/integration_tests/ integration_test/ .PHONY: dep dep: | $(DEP) diff --git a/pkg/transformers/integration_tests/integration_tests_suite_test.go b/pkg/transformers/integration_tests/integration_tests_suite_test.go index bbc99c1d..e2d58c2c 100644 --- a/pkg/transformers/integration_tests/integration_tests_suite_test.go +++ b/pkg/transformers/integration_tests/integration_tests_suite_test.go @@ -6,7 +6,6 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/spf13/viper" "io/ioutil" ) @@ -18,13 +17,6 @@ func TestIntegrationTests(t *testing.T) { } var _ = BeforeSuite(func() { - testConfig := viper.New() - testConfig.SetConfigName("staging") - testConfig.AddConfigPath("$GOPATH/src/github.com/vulcanize/vulcanizedb/environments/") - err := testConfig.ReadInConfig() - ipc = testConfig.GetString("client.ipcPath") - if err != nil { - log.Fatal(err) - } + ipc = "http://147.75.64.249:8545" //self hosted parity kovan node log.SetOutput(ioutil.Discard) }) From 2cc9826be9fee01c15e297ed8b0f6c9e0670cdbd Mon Sep 17 00:00:00 2001 From: Taka Goto Date: Mon, 5 Nov 2018 21:34:13 -0600 Subject: [PATCH 2/2] create integration toml file --- environments/integration.toml | 24 +++++++++++++++++++ .../integration_tests_suite_test.go | 10 +++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 environments/integration.toml diff --git a/environments/integration.toml b/environments/integration.toml new file mode 100644 index 00000000..318cf7b2 --- /dev/null +++ b/environments/integration.toml @@ -0,0 +1,24 @@ +[database] +name = "vulcanize_public" +hostname = "localhost" +user = "vulcanize" +password = "vulcanize" +port = 5432 + +[client] +ipcPath = "http://147.75.64.249:8545" + +[datadog] +name = "maker_vdb_staging" + +[contract] +cat = "0x2f34f22a00ee4b7a8f8bbc4eaee1658774c624e0" +drip = "0x891c04639a5edcae088e546fa125b5d7fb6a2b9d" +eth_flip = "0x32D496Ad866D110060866B7125981C73642cc509" +mcd_flop = "0x6191C9b0086c2eBF92300cC507009b53996FbFFa" +pep = "0xB1997239Cfc3d15578A3a09730f7f84A90BB4975" +pip = "0x9FfFE440258B79c5d6604001674A4722FfC0f7Bc" +pit = "0xe7cf3198787c9a4daac73371a38f29aaeeced87e" +rep = "0xf88bbdc1e2718f8857f30a180076ec38d53cf296" +vat = "0xcd726790550afcd77e9a7a47e86a3f9010af126b" +vow = "0x3728e9777B2a0a611ee0F89e00E01044ce4736d1" diff --git a/pkg/transformers/integration_tests/integration_tests_suite_test.go b/pkg/transformers/integration_tests/integration_tests_suite_test.go index e2d58c2c..681933f3 100644 --- a/pkg/transformers/integration_tests/integration_tests_suite_test.go +++ b/pkg/transformers/integration_tests/integration_tests_suite_test.go @@ -6,6 +6,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + "github.com/spf13/viper" "io/ioutil" ) @@ -17,6 +18,13 @@ func TestIntegrationTests(t *testing.T) { } var _ = BeforeSuite(func() { - ipc = "http://147.75.64.249:8545" //self hosted parity kovan node + testConfig := viper.New() + testConfig.SetConfigName("integration") + testConfig.AddConfigPath("$GOPATH/src/github.com/vulcanize/vulcanizedb/environments/") + err := testConfig.ReadInConfig() + ipc = testConfig.GetString("client.ipcPath") + if err != nil { + log.Fatal(err) + } log.SetOutput(ioutil.Discard) })