fileutil_test.go (etcd-3.5.5) | : | fileutil_test.go (etcd-3.5.6) | ||
---|---|---|---|---|
skipping to change at line 70 | skipping to change at line 70 | |||
} | } | |||
func TestCreateDirAll(t *testing.T) { | func TestCreateDirAll(t *testing.T) { | |||
tmpdir, err := ioutil.TempDir(os.TempDir(), "foo") | tmpdir, err := ioutil.TempDir(os.TempDir(), "foo") | |||
if err != nil { | if err != nil { | |||
t.Fatal(err) | t.Fatal(err) | |||
} | } | |||
defer os.RemoveAll(tmpdir) | defer os.RemoveAll(tmpdir) | |||
tmpdir2 := filepath.Join(tmpdir, "testdir") | tmpdir2 := filepath.Join(tmpdir, "testdir") | |||
if err = CreateDirAll(tmpdir2); err != nil { | if err = CreateDirAll(zaptest.NewLogger(t), tmpdir2); err != nil { | |||
t.Fatal(err) | t.Fatal(err) | |||
} | } | |||
if err = ioutil.WriteFile(filepath.Join(tmpdir2, "text.txt"), []byte("tes t text"), PrivateFileMode); err != nil { | if err = ioutil.WriteFile(filepath.Join(tmpdir2, "text.txt"), []byte("tes t text"), PrivateFileMode); err != nil { | |||
t.Fatal(err) | t.Fatal(err) | |||
} | } | |||
if err = CreateDirAll(tmpdir2); err == nil || !strings.Contains(err.Error (), "to be empty, got") { | if err = CreateDirAll(zaptest.NewLogger(t), tmpdir2); err == nil || !stri ngs.Contains(err.Error(), "to be empty, got") { | |||
t.Fatalf("unexpected error %v", err) | t.Fatalf("unexpected error %v", err) | |||
} | } | |||
} | } | |||
func TestExist(t *testing.T) { | func TestExist(t *testing.T) { | |||
fdir := filepath.Join(os.TempDir(), fmt.Sprint(time.Now().UnixNano()+rand .Int63n(1000))) | fdir := filepath.Join(os.TempDir(), fmt.Sprint(time.Now().UnixNano()+rand .Int63n(1000))) | |||
os.RemoveAll(fdir) | os.RemoveAll(fdir) | |||
if err := os.Mkdir(fdir, 0666); err != nil { | if err := os.Mkdir(fdir, 0666); err != nil { | |||
t.Skip(err) | t.Skip(err) | |||
} | } | |||
skipping to change at line 189 | skipping to change at line 189 | |||
func TestDirPermission(t *testing.T) { | func TestDirPermission(t *testing.T) { | |||
tmpdir, err := ioutil.TempDir(os.TempDir(), "foo") | tmpdir, err := ioutil.TempDir(os.TempDir(), "foo") | |||
if err != nil { | if err != nil { | |||
t.Fatal(err) | t.Fatal(err) | |||
} | } | |||
defer os.RemoveAll(tmpdir) | defer os.RemoveAll(tmpdir) | |||
tmpdir2 := filepath.Join(tmpdir, "testpermission") | tmpdir2 := filepath.Join(tmpdir, "testpermission") | |||
// create a new dir with 0700 | // create a new dir with 0700 | |||
if err = CreateDirAll(tmpdir2); err != nil { | if err = CreateDirAll(zaptest.NewLogger(t), tmpdir2); err != nil { | |||
t.Fatal(err) | t.Fatal(err) | |||
} | } | |||
// check dir permission with mode different than created dir | // check dir permission with mode different than created dir | |||
if err = CheckDirPermission(tmpdir2, 0600); err == nil { | if err = CheckDirPermission(tmpdir2, 0600); err == nil { | |||
t.Errorf("expected error, got nil") | t.Errorf("expected error, got nil") | |||
} | } | |||
} | } | |||
func TestRemoveMatchFile(t *testing.T) { | func TestRemoveMatchFile(t *testing.T) { | |||
tmpdir := t.TempDir() | tmpdir := t.TempDir() | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added |