diff --git a/dependencies/config/config_test.go b/dependencies/config/config_test.go index 3f39b02..5124b28 100644 --- a/dependencies/config/config_test.go +++ b/dependencies/config/config_test.go @@ -33,17 +33,10 @@ var hostname string // var testClient cli.ClientInterface func init() { - var err error testConfigContents = fmt.Sprintf(testConfigContentsFormat, "{{ .HOSTNAME }}") testTemplatePath = fmt.Sprintf("%s/%s/%s", templatePrefix, testConfigName, testConfigName) testConfigPath = fmt.Sprintf("%s/%s", testDir, testConfigName) - - hostname, err = os.Hostname() - - if err != nil { - fmt.Errorf("Could not get hostname", err) - } } func setupOsEnvironment() (err error) { @@ -123,6 +116,9 @@ var _ = Describe("Config", func() { result, err := ioutil.ReadFile(fmt.Sprintf("%s/%s", testDir, testConfigName)) Expect(err).NotTo(HaveOccurred()) + hostname, err := os.Hostname() + Expect(err).NotTo(HaveOccurred()) + expectedFile := fmt.Sprintf(testConfigContentsFormat, hostname) readConfig := string(result[:]) diff --git a/util/command/command.go b/util/command/command.go index 1be5d0a..bf2003b 100644 --- a/util/command/command.go +++ b/util/command/command.go @@ -18,7 +18,7 @@ func Execute(command []string) (err error) { env := os.Environ() err = syscall.Exec(path, command, env) if err != nil { - logger.Error.Print("Executing command %v failed: %v", command, err) + logger.Error.Printf("Executing command %v failed: %v", command, err) return } return diff --git a/util/env/env.go b/util/env/env.go index 60e20ec..dd55870 100644 --- a/util/env/env.go +++ b/util/env/env.go @@ -58,7 +58,7 @@ func SplitEnvToDeps(env string) (envList []Dependency) { continue } if nameAfterSplit[0] == "" { - logger.Warning.Printf("Invalid format, missing namespace", envVar) + logger.Warning.Printf("Invalid format, missing namespace %s", envVar) continue } @@ -88,7 +88,7 @@ func SplitPodEnvToDeps(env string) []PodDependency { err := json.Unmarshal([]byte(e), &deps) if err != nil { - logger.Warning.Printf("Invalid format: ", e) + logger.Warning.Printf("Invalid format: %v", e) return []PodDependency{} } @@ -116,7 +116,7 @@ func SplitJobEnvToDeps(env string, jsonEnv string) []JobDependency { } err := json.Unmarshal([]byte(jsonEnvVal), &deps) if err != nil { - logger.Warning.Printf("Invalid format: ", jsonEnvVal) + logger.Warning.Printf("Invalid format: %s", jsonEnvVal) return []JobDependency{} } diff --git a/util/env/env_test.go b/util/env/env_test.go index 34e5d04..01a58bc 100644 --- a/util/env/env_test.go +++ b/util/env/env_test.go @@ -28,7 +28,7 @@ func TestSplitEnvToListWithColon(t *testing.T) { t.Errorf("Expected: not nil") } if len(list1) != 1 { - t.Errorf("Expected len to be 1 not %i", len(list1)) + t.Errorf("Expected len to be 1 not %d", len(list1)) } if list1[0].Name != "foo1" { t.Errorf("Expected: foo1 got %s", list1[0])