github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #66331 from foxyriver/fix-log-error 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

more clear err log

**What this PR does / why we need it**:

more clear err log

**Release note**:

```release-note
NONE
```
pull/8/head
Kubernetes Submit Queue 2018-07-26 03:26:38 -07:00 committed by GitHub
parent e4465b6e2f 5c953681ad
commit ad97a03e73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/images/etcd/migrate/data_dir_test.go
View File

@ -39,7 +39,7 @@ func TestExistingDataDirWithVersionFile(t *testing.T) {
t.Fatalf("Failed to check if data dir is empty: %v", err) t.Fatalf("Failed to check if data dir is empty: %v", err)
} }
if isEmpty { if isEmpty {
t.Errorf("Data directory is non-empty") t.Errorf("Expected non-empty data directory to exist")
} }
exists, err := d.versionFile.Exists() exists, err := d.versionFile.Exists()
if err != nil { if err != nil {
@ -97,7 +97,7 @@ func TestNonexistingDataDir(t *testing.T) {
t.Fatalf("Failed to check if data dir is empty: %v", err) t.Fatalf("Failed to check if data dir is empty: %v", err)
} }
if !isEmpty { if !isEmpty {
t.Errorf("Data directory is empty") t.Errorf("Expected empty data directory to exist")
} }
err = d.Initialize(targetVersion) err = d.Initialize(targetVersion)
if err != nil { if err != nil {
@ -115,7 +115,7 @@ func TestNonexistingDataDir(t *testing.T) {
t.Fatalf("Failed to check if data dir is empty: %v", err) t.Fatalf("Failed to check if data dir is empty: %v", err)
} }
if isEmpty { if isEmpty {
t.Errorf("Data directory is non-empty") t.Errorf("Expected non-empty data directory to exist after Initialize()")
} }
vp, err := d.versionFile.Read() vp, err := d.versionFile.Read()
if err != nil { if err != nil {
@ -145,7 +145,7 @@ func TestBackup(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if isEmpty { if isEmpty {
t.Errorf("Expected non-empty backup directory afer Backup()") t.Errorf("Expected non-empty backup directory to exist after Backup()")
} }
} }