Fix tests; Tests run in their own directory

consensus/common_test.go

@@ -11,7 +11,7 @@ import (
 	dbm "github.com/tendermint/go-db"
 	"github.com/tendermint/go-events"
 	bc "github.com/tendermint/tendermint/blockchain"
-	_ "github.com/tendermint/tendermint/config/tendermint_test"
+	"github.com/tendermint/tendermint/config/tendermint_test"
 	mempl "github.com/tendermint/tendermint/mempool"
 	"github.com/tendermint/tendermint/proxy"
 	sm "github.com/tendermint/tendermint/state"
@@ -25,6 +25,7 @@ var chainID string
 var ensureTimeout = time.Duration(2)
 
 func init() {
+	tendermint_test.ResetConfig("consensus_common_test")
 	chainID = config.GetString("chain_id")
 }
 

consensus/height_vote_set_test.go

@@ -1,12 +1,16 @@
 package consensus
 
 import (
-	_ "github.com/tendermint/tendermint/config/tendermint_test"
+	"github.com/tendermint/tendermint/config/tendermint_test"
 	"github.com/tendermint/tendermint/types"
 
 	"testing"
 )
 
+func init() {
+	tendermint_test.ResetConfig("consensus_height_vote_set_test")
+}
+
 func TestPeerCatchupRounds(t *testing.T) {
 	valSet, privVals := types.RandValidatorSet(10, 1)
 

consensus/replay_test.go

@@ -50,8 +50,6 @@ func TestReplayCatchup(t *testing.T) {
 		t.Fatalf("Error on catchup replay %v", err)
 	}
 
-	cs.enterNewRound(cs.Height, cs.Round)
-
 	after := time.After(time.Second * 2)
 	select {
 	case <-newBlockCh:

consensus/state_test.go

@@ -6,11 +6,15 @@ import (
 	"testing"
 	"time"
 
-	_ "github.com/tendermint/tendermint/config/tendermint_test"
+	"github.com/tendermint/tendermint/config/tendermint_test"
 	//"github.com/tendermint/go-events"
 	"github.com/tendermint/tendermint/types"
 )
 
+func init() {
+	tendermint_test.ResetConfig("consensus_state_test")
+}
+
 func (tp *TimeoutParams) ensureProposeTimeout() time.Duration {
 	return time.Duration(tp.Propose0*2) * time.Millisecond
 }