Skip to content

Commit

Permalink
Merge pull request #244 from wking/server-filepath-join
Browse files Browse the repository at this point in the history
pkg/server/server_test: Use filepath.Join for path creation
  • Loading branch information
openshift-merge-robot authored Dec 17, 2018
2 parents 7b029f8 + 120ac21 commit a5d0713
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions pkg/server/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
"io/ioutil"
"path"
"path/filepath"
"reflect"
"testing"

Expand Down Expand Up @@ -64,7 +65,7 @@ func TestBootstrapServer(t *testing.T) {
t.Fatal(err)
}

mcPath := path.Join(testDir, "machine-configs", testConfig+".yaml")
mcPath := filepath.Join(testDir, "machine-configs", testConfig+".yaml")
mcData, err := ioutil.ReadFile(mcPath)
if err != nil {
t.Fatalf("unexpected error while reading machine-config: %s, err: %v", mcPath, err)
Expand Down Expand Up @@ -128,7 +129,7 @@ func TestClusterServer(t *testing.T) {
t.Fatal(err)
}

mcPath := path.Join(testDir, "machine-configs", testConfig+".yaml")
mcPath := filepath.Join(testDir, "machine-configs", testConfig+".yaml")
mcData, err := ioutil.ReadFile(mcPath)
if err != nil {
t.Fatalf("unexpected error while reading machine-config: %s, err: %v", mcPath, err)
Expand Down

0 comments on commit a5d0713

Please sign in to comment.