kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8914 from sharifelgamal/func-test 

remove hardcoding of testdata directory in functional tests
pull/8917/head
Sharif Elgamal 2020-08-04 14:22:09 -07:00 committed by GitHub
parent 3c3823182a c1067eb61e
commit 59c11558ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/integration/functional_test.go
View File

@ -901,12 +901,13 @@ func localEmptyCertPath() string {
func setupFileSync(ctx context.Context, t *testing.T, profile string) { func setupFileSync(ctx context.Context, t *testing.T, profile string) {
p := localSyncTestPath() p := localSyncTestPath()
t.Logf("local sync path: %s", p) t.Logf("local sync path: %s", p)
err := copy.Copy("./testdata/sync.test", p) syncFile := filepath.Join(*testdataDir, "sync.test")
err := copy.Copy(syncFile, p)
if err != nil { if err != nil {
t.Fatalf("failed to copy ./testdata/sync.test: %v", err) t.Fatalf("failed to copy testdata/sync.test: %v", err)
} }
testPem := "./testdata/minikube_test.pem" testPem := filepath.Join(*testdataDir, "minikube_test.pem")
// Write to a temp file for an atomic write // Write to a temp file for an atomic write
tmpPem := localTestCertPath() + ".pem" tmpPem := localTestCertPath() + ".pem"
@ -955,9 +956,10 @@ func validateFileSync(ctx context.Context, t *testing.T, profile string) {
got := rr.Stdout.String() got := rr.Stdout.String()
t.Logf("file sync test content: %s", got) t.Logf("file sync test content: %s", got)
expected, err := ioutil.ReadFile("./testdata/sync.test") syncFile := filepath.Join(*testdataDir, "sync.test")
expected, err := ioutil.ReadFile(syncFile)
if err != nil { if err != nil {
t.Errorf("failed to read test file '/testdata/sync.test' : %v", err) t.Errorf("failed to read test file 'testdata/sync.test' : %v", err)
} }
if diff := cmp.Diff(string(expected), got); diff != "" { if diff := cmp.Diff(string(expected), got); diff != "" {
@ -973,7 +975,8 @@ func validateCertSync(ctx context.Context, t *testing.T, profile string) {
t.Skipf("skipping: ssh unsupported by none") t.Skipf("skipping: ssh unsupported by none")
} }
want, err := ioutil.ReadFile("./testdata/minikube_test.pem") testPem := filepath.Join(*testdataDir, "minikube_test.pem")
want, err := ioutil.ReadFile(testPem)
if err != nil { if err != nil {
t.Errorf("test file not found: %v", err) t.Errorf("test file not found: %v", err)
} }