From ed509af17b8b838926d8e50d9e6f55be8311f284 Mon Sep 17 00:00:00 2001
From: Silas Davis <silas@erisindustries.com>
Date: Wed, 6 Jul 2016 15:24:29 +0100
Subject: [PATCH] share TestMain
---
core/config.go | 1 +
rpc/tendermint/test/common_test.go | 33 +++++++++++++++++++
rpc/tendermint/test/genesis.go | 2 +-
.../test/{shared_test.go => shared.go} | 26 ---------------
4 files changed, 35 insertions(+), 27 deletions(-)
create mode 100644 rpc/tendermint/test/common_test.go
rename rpc/tendermint/test/{shared_test.go => shared.go} (96%)
diff --git a/core/config.go b/core/config.go
index 941b5b54..ce8996f7 100644
--- a/core/config.go
+++ b/core/config.go
@@ -54,6 +54,7 @@ func loadModuleConfigFromDo(do *definitions.Do, module string) (*config.ModuleCo
func LoadModuleConfig(conf *viper.Viper, rootWorkDir, rootDataDir,
genesisFile, chainId, module string) (*config.ModuleConfig, error) {
moduleName := conf.GetString("chain." + module + ".name")
+ fmt.Println(moduleName)
majorVersion := conf.GetInt("chain." + module + ".major_version")
minorVersion := conf.GetInt("chain." + module + ".minor_version")
minorVersionString := version.MakeMinorVersionString(moduleName, majorVersion,
diff --git a/rpc/tendermint/test/common_test.go b/rpc/tendermint/test/common_test.go
new file mode 100644
index 00000000..6ff7ae9f
--- /dev/null
+++ b/rpc/tendermint/test/common_test.go
@@ -0,0 +1,33 @@
+package rpctest
+
+import (
+ "testing"
+ "github.com/eris-ltd/eris-db/test/fixtures"
+ "os"
+)
+
+// Needs to be in a _test.go file to be picked up
+func TestMain(m *testing.M) {
+ ffs := fixtures.NewFileFixtures()
+
+ initGlobalVariables(ffs)
+
+ if ffs.Error != nil {
+ panic(ffs.Error)
+ }
+
+ defer ffs.RemoveAll()
+
+ saveNewPriv()
+
+ ready := make(chan struct{})
+ go newNode(ready)
+ <-ready
+
+ returnValue := m.Run()
+
+ // start a node
+
+ os.Exit(returnValue)
+}
+
diff --git a/rpc/tendermint/test/genesis.go b/rpc/tendermint/test/genesis.go
index 6b36c8a7..4ab7b0d4 100644
--- a/rpc/tendermint/test/genesis.go
+++ b/rpc/tendermint/test/genesis.go
@@ -1,6 +1,6 @@
package rpctest
-// priv keys generated deterministically eg rpc/tests/shared_test.go
+// priv keys generated deterministically eg rpc/tests/shared.go
var defaultGenesis = `{
"chain_id" : "tendermint_test",
"accounts": [
diff --git a/rpc/tendermint/test/shared_test.go b/rpc/tendermint/test/shared.go
similarity index 96%
rename from rpc/tendermint/test/shared_test.go
rename to rpc/tendermint/test/shared.go
index 8e27fc1c..20c996fc 100644
--- a/rpc/tendermint/test/shared_test.go
+++ b/rpc/tendermint/test/shared.go
@@ -2,7 +2,6 @@ package rpctest
import (
"bytes"
- "fmt"
"strconv"
"testing"
@@ -21,7 +20,6 @@ import (
"github.com/spf13/viper"
nm "github.com/tendermint/tendermint/node"
"github.com/tendermint/tendermint/types"
- "os"
"path"
)
@@ -41,30 +39,6 @@ var (
testCore *core.Core
)
-func TestMain(m *testing.M) {
- ffs := fixtures.NewFileFixtures()
-
- initGlobalVariables(ffs)
-
- if ffs.Error != nil {
- panic(ffs.Error)
- }
-
- defer ffs.RemoveAll()
-
- saveNewPriv()
-
- ready := make(chan struct{})
- go newNode(ready)
- <-ready
-
- returnValue := m.Run()
-
- // start a node
-
- os.Exit(returnValue)
-}
-
// initialize config and create new node
func initGlobalVariables(ffs *fixtures.FileFixtures) {
testConfigFile := ffs.AddFile("config.toml", defaultConfig)
--
GitLab