summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Henderson <dhenderson@gmail.com>2020-08-29 12:17:01 -0400
committerDave Henderson <dhenderson@gmail.com>2020-08-29 12:17:01 -0400
commit611951c31d6efb86085a50768e91820ba2efee70 (patch)
tree6fb74eb531758f68586a8a9b7e737806ecacd44a
parentf6bb4891e871bf515c56e242ff38e653fecad50d (diff)
inline windows check
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
-rw-r--r--internal/tests/integration/basic_test.go3
-rw-r--r--internal/tests/integration/config_test.go7
-rw-r--r--internal/tests/integration/datasources_env_test.go3
-rw-r--r--internal/tests/integration/datasources_git_test.go3
-rw-r--r--internal/tests/integration/inputdir_test.go9
-rw-r--r--internal/tests/integration/integration_test.go4
-rw-r--r--internal/tests/integration/time_test.go3
7 files changed, 14 insertions, 18 deletions
diff --git a/internal/tests/integration/basic_test.go b/internal/tests/integration/basic_test.go
index 8c8ee48c..6323c1a5 100644
--- a/internal/tests/integration/basic_test.go
+++ b/internal/tests/integration/basic_test.go
@@ -6,7 +6,6 @@ import (
"bytes"
"io/ioutil"
"os"
- "runtime"
. "gopkg.in/check.v1"
@@ -102,7 +101,7 @@ func (s *BasicSuite) TestRoutesInputsToProperOutputs(c *C) {
for _, v := range testdata {
info, err := os.Stat(v.path)
assert.NilError(c, err)
- if runtime.GOOS != "windows" {
+ if !isWindows {
assert.Equal(c, v.mode, info.Mode())
}
content, err := ioutil.ReadFile(v.path)
diff --git a/internal/tests/integration/config_test.go b/internal/tests/integration/config_test.go
index e454dff6..c4c1b77c 100644
--- a/internal/tests/integration/config_test.go
+++ b/internal/tests/integration/config_test.go
@@ -6,7 +6,6 @@ import (
"bytes"
"io/ioutil"
"os"
- "runtime"
"gopkg.in/check.v1"
@@ -155,7 +154,7 @@ func (s *ConfigSuite) TestEnvConfigFile(c *check.C) {
}
func (s *ConfigSuite) TestConfigOverridesEnvDelim(c *check.C) {
- if runtime.GOOS != "windows" {
+ if !isWindows {
s.writeConfig(`inputFiles: [in]
leftDelim: (╯°□°)╯︵ ┻━┻
datasources:
@@ -173,7 +172,7 @@ datasources:
}
func (s *ConfigSuite) TestFlagOverridesAllDelim(c *check.C) {
- if runtime.GOOS != "windows" {
+ if !isWindows {
s.writeConfig(`inputFiles: [in]
leftDelim: (╯°□°)╯︵ ┻━┻
datasources:
@@ -191,7 +190,7 @@ datasources:
}
func (s *ConfigSuite) TestConfigOverridesEnvPluginTimeout(c *check.C) {
- if runtime.GOOS != "windows" {
+ if !isWindows {
s.writeConfig(`in: hi there {{ sleep 2 }}
plugins:
sleep: echo
diff --git a/internal/tests/integration/datasources_env_test.go b/internal/tests/integration/datasources_env_test.go
index dd2cc267..5c37cde1 100644
--- a/internal/tests/integration/datasources_env_test.go
+++ b/internal/tests/integration/datasources_env_test.go
@@ -4,7 +4,6 @@ package integration
import (
"os"
- "runtime"
. "gopkg.in/check.v1"
@@ -36,7 +35,7 @@ func (s *EnvDatasourcesSuite) TestEnvDatasources(c *C) {
"-i", `{{ ds "foo" }}`,
)
// Windows envvars are case-insensitive
- if runtime.GOOS == "windows" {
+ if isWindows {
result.Assert(c, icmd.Expected{ExitCode: 0, Out: "baz"})
} else {
result.Assert(c, icmd.Expected{ExitCode: 0, Out: "bar"})
diff --git a/internal/tests/integration/datasources_git_test.go b/internal/tests/integration/datasources_git_test.go
index ca990301..01bb757b 100644
--- a/internal/tests/integration/datasources_git_test.go
+++ b/internal/tests/integration/datasources_git_test.go
@@ -5,7 +5,6 @@ package integration
import (
"os"
"path/filepath"
- "runtime"
"strconv"
"time"
@@ -98,7 +97,7 @@ func (s *GitDatasourcesSuite) TestGitFileDatasource(c *C) {
}
func (s *GitDatasourcesSuite) TestGitDatasource(c *C) {
- if runtime.GOOS == "windows" {
+ if isWindows {
c.Skip("not going to run git daemon on Windows")
}
s.startGitDaemon()
diff --git a/internal/tests/integration/inputdir_test.go b/internal/tests/integration/inputdir_test.go
index 4256be61..3e3329da 100644
--- a/internal/tests/integration/inputdir_test.go
+++ b/internal/tests/integration/inputdir_test.go
@@ -5,7 +5,6 @@ package integration
import (
"io/ioutil"
"os"
- "runtime"
. "gopkg.in/check.v1"
@@ -78,7 +77,7 @@ func (s *InputDirSuite) TestInputDir(c *C) {
info, err := os.Stat(v.path)
assert.NilError(c, err)
// chmod support on Windows is pretty weak for now
- if runtime.GOOS != "windows" {
+ if !isWindows {
assert.Equal(c, v.mode, info.Mode(), v.path)
}
content, err := ioutil.ReadFile(v.path)
@@ -118,7 +117,7 @@ func (s *InputDirSuite) TestInputDirWithModeOverride(c *C) {
info, err := os.Stat(v.path)
assert.NilError(c, err)
// chmod support on Windows is pretty weak for now
- if runtime.GOOS != "windows" {
+ if !isWindows {
assert.Equal(c, v.mode, info.Mode())
}
content, err := ioutil.ReadFile(v.path)
@@ -159,7 +158,7 @@ func (s *InputDirSuite) TestOutputMapInline(c *C) {
info, err := os.Stat(v.path)
assert.NilError(c, err)
// chmod support on Windows is pretty weak for now
- if runtime.GOOS != "windows" {
+ if !isWindows {
assert.Equal(c, v.mode, info.Mode())
}
content, err := ioutil.ReadFile(v.path)
@@ -202,7 +201,7 @@ func (s *InputDirSuite) TestOutputMapExternal(c *C) {
info, err := os.Stat(v.path)
assert.NilError(c, err)
// chmod support on Windows is pretty weak for now
- if runtime.GOOS != "windows" {
+ if !isWindows {
assert.Equal(c, v.mode, info.Mode())
}
content, err := ioutil.ReadFile(v.path)
diff --git a/internal/tests/integration/integration_test.go b/internal/tests/integration/integration_test.go
index 6c33638b..46ca5ebf 100644
--- a/internal/tests/integration/integration_test.go
+++ b/internal/tests/integration/integration_test.go
@@ -24,10 +24,12 @@ var (
GomplateBin string
)
+const isWindows = runtime.GOOS == "windows"
+
// nolint: gochecknoinits
func init() {
ext := ""
- if runtime.GOOS == "windows" {
+ if isWindows {
ext = ".exe"
}
GomplateBin = filepath.Join(build.Default.GOPATH, "src", "github.com", "hairyhenderson", "gomplate", "bin", "gomplate"+ext)
diff --git a/internal/tests/integration/time_test.go b/internal/tests/integration/time_test.go
index 78a98dbd..1cccab66 100644
--- a/internal/tests/integration/time_test.go
+++ b/internal/tests/integration/time_test.go
@@ -3,7 +3,6 @@
package integration
import (
- "runtime"
"time"
. "gopkg.in/check.v1"
@@ -20,7 +19,7 @@ func (s *TimeSuite) TestTime(c *C) {
inOutTest(c, `{{ (time.Parse "`+f+`" "`+i+`").Format "2006-01-02 15 -0700" }}`,
"2009-02-13 23 +0000")
- if runtime.GOOS != "windows" {
+ if !isWindows {
result := icmd.RunCmd(icmd.Command(GomplateBin, "-i",
`{{ (time.ParseLocal time.Kitchen "6:00AM").Format "15:04 MST" }}`), func(cmd *icmd.Cmd) {
cmd.Env = []string{"TZ=Africa/Luanda"}