remove TestBypass flag (#566)

Tests should explicitly state their target configuration file, so no need
to use fallback default override flag
This commit is contained in:
Rauno Ots
2020-09-28 01:45:40 +02:00
committed by GitHub
parent d9bcf8246f
commit ecbc68561f
4 changed files with 11 additions and 18 deletions

View File

@@ -4,7 +4,6 @@ import (
"bufio"
"encoding/json"
"errors"
"flag"
"fmt"
"io"
"io/ioutil"
@@ -1484,10 +1483,6 @@ func GetFilePath(configfile string) (string, error) {
return configfile, nil
}
if flag.Lookup("test.v") != nil && !TestBypass {
return TestFile, nil
}
exePath, err := common.GetExecutablePath()
if err != nil {
return "", err

View File

@@ -8,6 +8,7 @@ import (
"github.com/thrasher-corp/gocryptotrader/common"
"github.com/thrasher-corp/gocryptotrader/common/convert"
"github.com/thrasher-corp/gocryptotrader/common/file"
"github.com/thrasher-corp/gocryptotrader/connchecker"
"github.com/thrasher-corp/gocryptotrader/currency"
"github.com/thrasher-corp/gocryptotrader/database"
@@ -1643,11 +1644,6 @@ func TestReadConfig(t *testing.T) {
if err == nil {
t.Error("TestReadConfig error cannot be nil")
}
err = readConfig.ReadConfig("", true)
if err != nil {
t.Error("TestReadConfig error")
}
}
func TestLoadConfig(t *testing.T) {
@@ -1714,12 +1710,17 @@ func TestGetFilePath(t *testing.T) {
t.Errorf("TestGetFilePath: expected %s got %s", expected, result)
}
expected = TestFile
result, _ = GetFilePath("")
if result != expected {
t.Errorf("TestGetFilePath: expected %s got %s", expected, result)
expected = DefaultFilePath()
result, err := GetFilePath("")
if file.Exists(expected) {
if err != nil || result != expected {
t.Errorf("TestGetFilePath: expected %s got %s", expected, result)
}
} else {
if err == nil {
t.Error("Expected error when default config file does not exist")
}
}
TestBypass = true
}
func TestCheckRemoteControlConfig(t *testing.T) {

View File

@@ -69,7 +69,6 @@ const (
var (
Cfg Config
IsInitialSetup bool
TestBypass bool
m sync.Mutex
)