perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add osutil.Glob to deal with Windows (fixes #1690)

Browse Source
This commit is contained in:
Audrius Butkevicius
2015-04-26 15:41:04 +01:00
parent 15b87ae297
commit d12db3e7b8
10 changed files with 173 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/cli_test.go
View File

@@ -49,7 +49,7 @@ func TestCLIReset(t *testing.T) {
// Clean up
dirs, err = filepath.Glob("*.syncthing-reset-*")
dirs, err = osutil.Glob("*.syncthing-reset-*")
if err != nil {
t.Fatal(err)
}

20
test/conflict_test.go
View File

@@ -120,7 +120,7 @@ func TestConflict(t *testing.T) {
// The conflict is expected on the s2 side due to how we calculate which
// file is the winner (based on device ID)
files, err := filepath.Glob("s2/*sync-conflict*")
files, err := osutil.Glob("s2/*sync-conflict*")
if err != nil {
t.Fatal(err)
}
@@ -170,7 +170,7 @@ func TestConflict(t *testing.T) {
// The conflict should manifest on the s2 side again, where we should have
// moved the file to a conflict copy instead of just deleting it.
files, err = filepath.Glob("s2/*sync-conflict*")
files, err = osutil.Glob("s2/*sync-conflict*")
if err != nil {
t.Fatal(err)
}
@@ -240,7 +240,7 @@ func TestInitialMergeConflicts(t *testing.T) {
// s1 should have three-four files (there's a conflict from s2 which may or may not have synced yet)
files, err := filepath.Glob("s1/file*")
files, err := osutil.Glob("s1/file*")
if err != nil {
t.Fatal(err)
}
@@ -250,7 +250,7 @@ func TestInitialMergeConflicts(t *testing.T) {
// s2 should have four files (there's a conflict)
files, err = filepath.Glob("s2/file*")
files, err = osutil.Glob("s2/file*")
if err != nil {
t.Fatal(err)
}
@@ -260,7 +260,7 @@ func TestInitialMergeConflicts(t *testing.T) {
// file1 is in conflict, so there's two versions of that one
files, err = filepath.Glob("s2/file1*")
files, err = osutil.Glob("s2/file1*")
if err != nil {
t.Fatal(err)
}
@@ -316,7 +316,7 @@ func TestResetConflicts(t *testing.T) {
// s1 should have three files
files, err := filepath.Glob("s1/file*")
files, err := osutil.Glob("s1/file*")
if err != nil {
t.Fatal(err)
}
@@ -326,7 +326,7 @@ func TestResetConflicts(t *testing.T) {
// s2 should have three
files, err = filepath.Glob("s2/file*")
files, err = osutil.Glob("s2/file*")
if err != nil {
t.Fatal(err)
}
@@ -409,7 +409,7 @@ func TestResetConflicts(t *testing.T) {
// s2 should have five files (three plus two conflicts)
files, err = filepath.Glob("s2/file*")
files, err = osutil.Glob("s2/file*")
if err != nil {
t.Fatal(err)
}
@@ -419,7 +419,7 @@ func TestResetConflicts(t *testing.T) {
// file1 is in conflict, so there's two versions of that one
files, err = filepath.Glob("s2/file1*")
files, err = osutil.Glob("s2/file1*")
if err != nil {
t.Fatal(err)
}
@@ -429,7 +429,7 @@ func TestResetConflicts(t *testing.T) {
// file2 is in conflict, so there's two versions of that one
files, err = filepath.Glob("s2/file2*")
files, err = osutil.Glob("s2/file2*")
if err != nil {
t.Fatal(err)
}

2
test/util.go
View File

@@ -241,7 +241,7 @@ func (i *inifiteReader) Read(bs []byte) (int, error) {
// rm -rf
func removeAll(dirs ...string) error {
for _, dir := range dirs {
files, err := filepath.Glob(dir)
files, err := osutil.Glob(dir)
if err != nil {
return err
}