Add OS X CI Matrix support to Travis (#284)

Add OS X CI Matrix support to Travis
This commit is contained in:
Ryan O'Hara-Reid
2019-04-30 15:27:16 +10:00
committed by Adrian Gallagher
parent 88bc17a17f
commit 2f1405ead4
6 changed files with 99 additions and 102 deletions

View File

@@ -20,7 +20,7 @@ import (
"net/http"
"net/url"
"os"
"path"
"os/user"
"path/filepath"
"reflect"
"regexp"
@@ -605,13 +605,20 @@ func TimeFromUnixTimestampFloat(raw interface{}) (time.Time, error) {
// Linux/Unix or OSX - $HOME/.gocryptotrader
func GetDefaultDataDir(env string) string {
if env == "windows" {
return os.Getenv("APPDATA") + GetOSPathSlash() + "GoCryptoTrader"
return filepath.Join(os.Getenv("APPDATA"), "GoCryptoTrader")
}
dir, ok := os.LookupEnv("HOME")
if !ok {
return ""
usr, err := user.Current()
if err == nil {
return filepath.Join(usr.HomeDir, ".gocryptotrader")
}
return path.Join(dir, ".gocryptotrader")
dir, err := os.UserHomeDir()
if err != nil {
log.Warn("Environment variable unset, defaulting to current directory")
dir = "."
}
return filepath.Join(dir, ".gocryptotrader")
}
// CreateDir creates a directory based on the supplied parameter

View File

@@ -4,7 +4,8 @@ import (
"bytes"
"net/url"
"os"
"path"
"os/user"
"path/filepath"
"reflect"
"runtime"
"strings"
@@ -961,17 +962,24 @@ func TestGetDefaultDataDir(t *testing.T) {
if !ok {
t.Fatal("APPDATA is not set")
}
dir += GetOSPathSlash() + "GoCryptoTrader"
actualOutput := GetDefaultDataDir("windows")
dir = filepath.Join(dir, "GoCryptoTrader")
actualOutput := GetDefaultDataDir(runtime.GOOS)
if actualOutput != dir {
t.Fatalf("Unexpected result. Got: %v Expected: %v", actualOutput, dir)
}
case "linux", "darwin":
dir, ok := os.LookupEnv("HOME")
if !ok {
t.Fatal("HOME is not set")
default:
var dir string
usr, err := user.Current()
if err == nil {
dir = usr.HomeDir
} else {
var err error
dir, err = os.UserHomeDir()
if err != nil {
dir = "."
}
}
dir += GetOSPathSlash() + ".gocryptotrader"
dir = filepath.Join(dir, ".gocryptotrader")
actualOutput := GetDefaultDataDir(runtime.GOOS)
if actualOutput != dir {
t.Fatalf("Unexpected result. Got: %v Expected: %v", actualOutput, dir)
@@ -982,12 +990,18 @@ func TestGetDefaultDataDir(t *testing.T) {
func TestCreateDir(t *testing.T) {
switch runtime.GOOS {
case "windows":
// test for looking up an invalid directory
err := CreateDir("")
if err == nil {
t.Fatal("expected err due to invalid path, but got nil")
}
// test for a directory that exists
dir, ok := os.LookupEnv("TEMP")
if !ok {
t.Fatal("LookupEnv failed. TEMP is not set")
}
err := CreateDir(dir)
err = CreateDir(dir)
if err != nil {
t.Fatalf("CreateDir failed. Err: %v", err)
}
@@ -1006,16 +1020,14 @@ func TestCreateDir(t *testing.T) {
if err != nil {
t.Fatalf("Failed to remove file. Err: %v", err)
}
// test for looking up an invalid directory
err = CreateDir("")
default:
err := CreateDir("")
if err == nil {
t.Fatal("expected err due to invalid path, but got nil")
}
case "linux":
// same tests for linux
dir := "/home"
err := CreateDir(dir)
err = CreateDir(dir)
if err != nil {
t.Fatalf("CreateDir failed. Err: %v", err)
}
@@ -1024,7 +1036,7 @@ func TestCreateDir(t *testing.T) {
if !ok {
t.Fatal("LookupEnv of HOME failed")
}
dir = path.Join(dir, ".gocryptotrader", "TestFileASFG")
dir = filepath.Join(dir, ".gocryptotrader", "TestFileASFG")
err = CreateDir(dir)
if err != nil {
t.Errorf("CreateDir failed. Err: %s", err)
@@ -1033,77 +1045,11 @@ func TestCreateDir(t *testing.T) {
if err != nil {
t.Fatalf("Failed to remove file. Err: %v", err)
}
// test for creating an invalid directory
err = CreateDir("")
if err == nil {
t.Fatal("expected err due to invalid path, but got nil")
}
case "darwin":
// same test except for the invalid directory
dir := "/home"
err := CreateDir(dir)
if err != nil {
t.Fatalf("CreateDir failed. Err: %v", err)
}
var ok bool
dir, ok = os.LookupEnv("HOME")
if !ok {
t.Fatal("LookupEnv of HOME failed")
}
dir = path.Join(dir, ".gocryptotrader", "TestFileASFG")
err = CreateDir(dir)
if err != nil {
t.Fatalf("CreateDir failed. Err: %s", err)
}
err = os.Remove(dir)
if err != nil {
t.Fatalf("Failed to remove file. Err: %v", err)
}
err = CreateDir(":")
if err == nil {
t.Fatal("expected err due to invalid path, but got nil")
}
}
}
func TestChangePerm(t *testing.T) {
switch runtime.GOOS {
case "linux", "darwin":
if runtime.GOOS == "linux" {
err := ChangePerm("")
if err == nil {
t.Fatal("expected an error on non-existent path")
}
} else {
err := ChangePerm(":")
if err == nil {
t.Fatal("expected an error on non-existent path")
}
}
err := os.Mkdir(GetDefaultDataDir(runtime.GOOS)+GetOSPathSlash()+"TestFileASDFGHJ", 0777)
if err != nil {
t.Fatalf("Mkdir failed. Err: %v", err)
}
err = ChangePerm(GetDefaultDataDir(runtime.GOOS))
if err != nil {
t.Fatal("ChangePerm was unsuccessful")
}
var a os.FileInfo
a, err = os.Stat(GetDefaultDataDir(runtime.GOOS) + GetOSPathSlash() + "TestFileASDFGHJ")
if err != nil {
t.Fatalf("os.Stat failed. Err: %v", err)
}
if a.Mode().Perm() != 0770 {
t.Fatalf("expected file permissions differ. expecting 0770 got %#o", a.Mode().Perm())
}
err = RemoveFile(GetDefaultDataDir(runtime.GOOS) + GetOSPathSlash() + "TestFileASDFGHJ")
if err != nil {
t.Fatalf("RemoveFile failed. Err: %v", err)
}
case "windows":
err := ChangePerm("*")
if err == nil {
@@ -1125,5 +1071,30 @@ func TestChangePerm(t *testing.T) {
if err != nil {
t.Fatalf("RemoveFile failed. Err: %v", err)
}
default:
err := ChangePerm("")
if err == nil {
t.Fatal("expected an error on non-existent path")
}
err = os.Mkdir(GetDefaultDataDir(runtime.GOOS)+GetOSPathSlash()+"TestFileASDFGHJ", 0777)
if err != nil {
t.Fatalf("Mkdir failed. Err: %v", err)
}
err = ChangePerm(GetDefaultDataDir(runtime.GOOS))
if err != nil {
t.Fatalf("ChangePerm was unsuccessful. Err: %v", err)
}
var a os.FileInfo
a, err = os.Stat(GetDefaultDataDir(runtime.GOOS) + GetOSPathSlash() + "TestFileASDFGHJ")
if err != nil {
t.Fatalf("os.Stat failed. Err: %v", err)
}
if a.Mode().Perm() != 0770 {
t.Fatalf("expected file permissions differ. expecting 0770 got %#o", a.Mode().Perm())
}
err = RemoveFile(GetDefaultDataDir(runtime.GOOS) + GetOSPathSlash() + "TestFileASDFGHJ")
if err != nil {
t.Fatalf("RemoveFile failed. Err: %v", err)
}
}
}