Skip to content

Commit

Permalink
Merge pull request kubernetes#66331 from foxyriver/fix-log-error
Browse files Browse the repository at this point in the history
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
```
  • Loading branch information
Kubernetes Submit Queue authored Jul 26, 2018
2 parents e4465b6 + 5c95368 commit ad97a03
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions cluster/images/etcd/migrate/data_dir_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func TestExistingDataDirWithVersionFile(t *testing.T) {
t.Fatalf("Failed to check if data dir is empty: %v", err)
}
if isEmpty {
t.Errorf("Data directory is non-empty")
t.Errorf("Expected non-empty data directory to exist")
}
exists, err := d.versionFile.Exists()
if err != nil {
Expand Down Expand Up @@ -97,7 +97,7 @@ func TestNonexistingDataDir(t *testing.T) {
t.Fatalf("Failed to check if data dir is empty: %v", err)
}
if !isEmpty {
t.Errorf("Data directory is empty")
t.Errorf("Expected empty data directory to exist")
}
err = d.Initialize(targetVersion)
if err != nil {
Expand All @@ -115,7 +115,7 @@ func TestNonexistingDataDir(t *testing.T) {
t.Fatalf("Failed to check if data dir is empty: %v", err)
}
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()
if err != nil {
Expand Down Expand Up @@ -145,7 +145,7 @@ func TestBackup(t *testing.T) {
t.Fatal(err)
}
if isEmpty {
t.Errorf("Expected non-empty backup directory afer Backup()")
t.Errorf("Expected non-empty backup directory to exist after Backup()")
}
}

Expand Down

0 comments on commit ad97a03

Please sign in to comment.