diff --git a/cmd/bisync/bisync_test.go b/cmd/bisync/bisync_test.go index 24e91c8e9..dbf009aa3 100644 --- a/cmd/bisync/bisync_test.go +++ b/cmd/bisync/bisync_test.go @@ -275,7 +275,7 @@ func testBisync(t *testing.T, path1, path2 string) { baseDir, err := os.Getwd() require.NoError(t, err, "get current directory") - randName := "bs-" + time.Now().Format("150405-") + random.String(2) // some bucket backends don't like dots, keep this short to avoid linux errors + randName := time.Now().Format("150405") + random.String(2) // some bucket backends don't like dots, keep this short to avoid linux errors tempDir := filepath.Join(os.TempDir(), randName) workDir := filepath.Join(tempDir, "workdir") diff --git a/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path1.lst index f73773e5d..153f062b1 100644 --- a/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path1.lst @@ -6,8 +6,8 @@ - 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path1.lst-new index f73773e5d..153f062b1 100644 --- a/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -6,8 +6,8 @@ - 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path1.lst-old index f73773e5d..153f062b1 100644 --- a/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -6,8 +6,8 @@ - 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path2.lst index f73773e5d..153f062b1 100644 --- a/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path2.lst @@ -6,8 +6,8 @@ - 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path2.lst-new index f73773e5d..153f062b1 100644 --- a/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path2.lst-new @@ -6,8 +6,8 @@ - 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path2.lst-old index f73773e5d..153f062b1 100644 --- a/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_ext_paths/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -6,8 +6,8 @@ - 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_ext_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path1.lst-err b/cmd/bisync/testdata/test_ext_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path1.lst-err index f73773e5d..153f062b1 100644 --- a/cmd/bisync/testdata/test_ext_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path1.lst-err +++ b/cmd/bisync/testdata/test_ext_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path1.lst-err @@ -6,8 +6,8 @@ - 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_ext_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_ext_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path1.lst-new index 06590645e..6786deb40 100644 --- a/cmd/bisync/testdata/test_ext_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_ext_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path1.lst-new @@ -6,7 +6,7 @@ - 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ࢺ_.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_ext_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path2.lst-err b/cmd/bisync/testdata/test_ext_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path2.lst-err index f73773e5d..153f062b1 100644 --- a/cmd/bisync/testdata/test_ext_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path2.lst-err +++ b/cmd/bisync/testdata/test_ext_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path2.lst-err @@ -6,8 +6,8 @@ - 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_ext_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_ext_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path2.lst-new index f73773e5d..153f062b1 100644 --- a/cmd/bisync/testdata/test_ext_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_ext_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path2.lst-new @@ -6,8 +6,8 @@ - 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst index f73773e5d..153f062b1 100644 --- a/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst @@ -6,8 +6,8 @@ - 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-err b/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-err index f73773e5d..153f062b1 100644 --- a/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-err +++ b/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-err @@ -6,8 +6,8 @@ - 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-new index f73773e5d..153f062b1 100644 --- a/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-new @@ -6,8 +6,8 @@ - 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-old index f73773e5d..153f062b1 100644 --- a/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-old @@ -6,8 +6,8 @@ - 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst index f73773e5d..153f062b1 100644 --- a/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst @@ -6,8 +6,8 @@ - 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-err b/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-err index f73773e5d..153f062b1 100644 --- a/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-err +++ b/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-err @@ -6,8 +6,8 @@ - 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-new index f73773e5d..153f062b1 100644 --- a/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-new @@ -6,8 +6,8 @@ - 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-old index f73773e5d..153f062b1 100644 --- a/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_ext_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-old @@ -6,8 +6,8 @@ - 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" - 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試Русский ěáñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試Русский ěáñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.copy1to2.que b/cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.copy1to2.que similarity index 100% rename from cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.copy1to2.que rename to cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.copy1to2.que diff --git a/cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.copy2to1.que b/cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.copy2to1.que similarity index 100% rename from cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.copy2to1.que rename to cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.copy2to1.que diff --git a/cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst b/cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.path1.lst similarity index 100% rename from cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst rename to cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.path1.lst diff --git a/cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst-new b/cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.path1.lst-new similarity index 100% rename from cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst-new rename to cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.path1.lst-new diff --git a/cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst-old b/cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.path1.lst-old similarity index 100% rename from cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst-old rename to cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.path1.lst-old diff --git a/cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst b/cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.path2.lst similarity index 100% rename from cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst rename to cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.path2.lst diff --git a/cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst-new b/cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.path2.lst-new similarity index 100% rename from cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst-new rename to cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.path2.lst-new diff --git a/cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst-old b/cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.path2.lst-old similarity index 100% rename from cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst-old rename to cmd/bisync/testdata/test_ext_paths/golden/normal-sync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.path2.lst-old diff --git a/cmd/bisync/testdata/test_ext_paths/golden/resync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst b/cmd/bisync/testdata/test_ext_paths/golden/resync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.path1.lst similarity index 100% rename from cmd/bisync/testdata/test_ext_paths/golden/resync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst rename to cmd/bisync/testdata/test_ext_paths/golden/resync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.path1.lst diff --git a/cmd/bisync/testdata/test_ext_paths/golden/resync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst-new b/cmd/bisync/testdata/test_ext_paths/golden/resync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.path1.lst-new similarity index 100% rename from cmd/bisync/testdata/test_ext_paths/golden/resync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst-new rename to cmd/bisync/testdata/test_ext_paths/golden/resync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.path1.lst-new diff --git a/cmd/bisync/testdata/test_ext_paths/golden/resync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst b/cmd/bisync/testdata/test_ext_paths/golden/resync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.path2.lst similarity index 100% rename from cmd/bisync/testdata/test_ext_paths/golden/resync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst rename to cmd/bisync/testdata/test_ext_paths/golden/resync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.path2.lst diff --git a/cmd/bisync/testdata/test_ext_paths/golden/resync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst-new b/cmd/bisync/testdata/test_ext_paths/golden/resync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.path2.lst-new similarity index 100% rename from cmd/bisync/testdata/test_ext_paths/golden/resync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst-new rename to cmd/bisync/testdata/test_ext_paths/golden/resync._testdir_path1_測試Русский__ěáñ.._testdir_path2_測試Русский__ěáñ.path2.lst-new diff --git a/cmd/bisync/testdata/test_ext_paths/golden/test.log b/cmd/bisync/testdata/test_ext_paths/golden/test.log index 7cd895960..d7f9f3327 100644 --- a/cmd/bisync/testdata/test_ext_paths/golden/test.log +++ b/cmd/bisync/testdata/test_ext_paths/golden/test.log @@ -1,19 +1,19 @@ (01) : test extended-char-paths -(02) : fix-names {path1/}測試_Русский_{spc}_{spc}_ě_áñ/ -(03) : fix-names {path2/}測試_Русский_{spc}_{spc}_ě_áñ/ -(04) : fix-names {path1/}測試_Русский_{spc}_{spc}_ě_áñ/測試_check{spc}file -(05) : fix-names {path2/}測試_Русский_{spc}_{spc}_ě_áñ/測試_check{spc}file -(06) : fix-names {path1/}測試_Русский_{spc}_{spc}_ě_áñ/filename_contains_ě_.txt -(07) : fix-names {path2/}測試_Русский_{spc}_{spc}_ě_áñ/filename_contains_ě_.txt +(02) : fix-names {path1/}測試Русский{spc}{spc}ěáñ/ +(03) : fix-names {path2/}測試Русский{spc}{spc}ěáñ/ +(04) : fix-names {path1/}測試Русский{spc}{spc}ěáñ/測試_check{spc}file +(05) : fix-names {path2/}測試Русский{spc}{spc}ěáñ/測試_check{spc}file +(06) : fix-names {path1/}測試Русский{spc}{spc}ěáñ/filename_contains_ě_.txt +(07) : fix-names {path2/}測試Русский{spc}{spc}ěáñ/filename_contains_ě_.txt (08) : fix-names {path1/}測試_check{spc}file (09) : fix-names {path2/}測試_check{spc}file -(10) : fix-names {path1/}測試_Русский_{spc}_{spc}_ě_áñ/測試_check{spc}file -(11) : fix-names {path2/}測試_Русский_{spc}_{spc}_ě_áñ/測試_check{spc}file +(10) : fix-names {path1/}測試Русский{spc}{spc}ěáñ/測試_check{spc}file +(11) : fix-names {path2/}測試Русский{spc}{spc}ěáñ/測試_check{spc}file (12) : test resync subdirs with extended chars -(13) : bisync subdir=測試_Русский_{spc}_{spc}_ě_áñ resync +(13) : bisync subdir=測試Русский{spc}{spc}ěáñ resync INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. INFO : Bisyncing with Comparison Settings: { @@ -24,23 +24,23 @@ INFO : Bisyncing with Comparison Settings: "SlowHashSyncOnly": false, "DownloadHash": false } -INFO : Synching Path1 "{path1/}測試_Русский_ _ _ě_áñ/" with Path2 "{path2/}測試_Русский_ _ _ě_áñ/" +INFO : Synching Path1 "{path1/}測試Русский ěáñ/" with Path2 "{path2/}測試Русский ěáñ/" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 INFO : - Path1 Resync is copying files to - Path2 INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}測試_Русский_ _ _ě_áñ/" vs Path2 "{path2/}測試_Русский_ _ _ě_áñ/" +INFO : Validating listings for Path1 "{path1/}測試Русский ěáñ/" vs Path2 "{path2/}測試Русский ěáñ/" INFO : Bisync successful (14) : copy-listings resync (15) : test place new files with extended chars on each side (16) : touch-glob 2001-01-02 {datadir/} file1.txt -(17) : copy-as {datadir/}file1.txt {path1/}測試_Русский_{spc}_{spc}_ě_áñ 測試_file1p1 -(18) : copy-as {datadir/}file1.txt {path2/}測試_Русский_{spc}_{spc}_ě_áñ 測試_file1p2 +(17) : copy-as {datadir/}file1.txt {path1/}測試Русский{spc}{spc}ěáñ 測試_file1p1 +(18) : copy-as {datadir/}file1.txt {path2/}測試Русский{spc}{spc}ěáñ 測試_file1p2 (19) : test normal sync of subdirs with extended chars -(20) : bisync subdir=測試_Русский_{spc}_{spc}_ě_áñ +(20) : bisync subdir=測試Русский{spc}{spc}ěáñ INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. INFO : Bisyncing with Comparison Settings: { @@ -51,7 +51,7 @@ INFO : Bisyncing with Comparison Settings: "SlowHashSyncOnly": false, "DownloadHash": false } -INFO : Synching Path1 "{path1/}測試_Русский_ _ _ě_áñ/" with Path2 "{path2/}測試_Русский_ _ _ě_áñ/" +INFO : Synching Path1 "{path1/}測試Русский ěáñ/" with Path2 "{path2/}測試Русский ěáñ/" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs INFO : - Path1 File is new - 測試_file1p1 @@ -60,12 +60,12 @@ INFO : Path2 checking for diffs INFO : - Path2 File is new - 測試_file1p2 INFO : Path2: 1 changes:  1 new,  0 modified,  0 deleted INFO : Applying changes -INFO : - Path1 Queue copy to Path2 - {path2/}測試_Русский_ _ _ě_áñ/測試_file1p1 -INFO : - Path2 Queue copy to Path1 - {path1/}測試_Русский_ _ _ě_áñ/測試_file1p2 +INFO : - Path1 Queue copy to Path2 - {path2/}測試Русский ěáñ/測試_file1p1 +INFO : - Path2 Queue copy to Path1 - {path1/}測試Русский ěáñ/測試_file1p2 INFO : - Path2 Do queued copies to - Path1 INFO : - Path1 Do queued copies to - Path2 INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}測試_Русский_ _ _ě_áñ/" vs Path2 "{path2/}測試_Русский_ _ _ě_áñ/" +INFO : Validating listings for Path1 "{path1/}測試Русский ěáñ/" vs Path2 "{path2/}測試Русский ěáñ/" INFO : Bisync successful (21) : move-listings normal-sync @@ -88,7 +88,7 @@ INFO : - Path1 Resync is copying files to - P INFO : Resync updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful -(24) : delete-file {path1/}測試_Русский_{spc}_{spc}_ě_áñ/測試_check{spc}file +(24) : delete-file {path1/}測試Русский{spc}{spc}ěáñ/測試_check{spc}file (25) : bisync check-access check-filename=測試_check{spc}file INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. INFO : Bisyncing with Comparison Settings: @@ -103,12 +103,12 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File was deleted - 測試_Русский_ _ _ě_áñ/測試_check file +INFO : - Path1 File was deleted - 測試Русский ěáñ/測試_check file INFO : Path1: 1 changes:  0 new,  0 modified,  1 deleted INFO : Path2 checking for diffs INFO : Checking access health ERROR : Access test failed: Path1 count 1, Path2 count 2 - 測試_check file -ERROR : -  Access test failed: Path2 file not found in Path1 - 測試_Русский_ _ _ě_áñ/測試_check file +ERROR : -  Access test failed: Path2 file not found in Path1 - 測試Русский ěáñ/測試_check file ERROR : Bisync critical error: check file check failed ERROR : Bisync aborted. Must run --resync to recover. Bisync error: bisync aborted diff --git a/cmd/bisync/testdata/test_ext_paths/initial/測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt b/cmd/bisync/testdata/test_ext_paths/initial/測試Русский ěáñ/filename_contains_ě_.txt similarity index 100% rename from cmd/bisync/testdata/test_ext_paths/initial/測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt rename to cmd/bisync/testdata/test_ext_paths/initial/測試Русский ěáñ/filename_contains_ě_.txt diff --git a/cmd/bisync/testdata/test_ext_paths/initial/測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt b/cmd/bisync/testdata/test_ext_paths/initial/測試Русский ěáñ/filename_contains_ࢺ_.txt similarity index 100% rename from cmd/bisync/testdata/test_ext_paths/initial/測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt rename to cmd/bisync/testdata/test_ext_paths/initial/測試Русский ěáñ/filename_contains_ࢺ_.txt diff --git a/cmd/bisync/testdata/test_ext_paths/initial/測試_Русский_ _ _ě_áñ/測試_check file b/cmd/bisync/testdata/test_ext_paths/initial/測試Русский ěáñ/測試_check file similarity index 100% rename from cmd/bisync/testdata/test_ext_paths/initial/測試_Русский_ _ _ě_áñ/測試_check file rename to cmd/bisync/testdata/test_ext_paths/initial/測試Русский ěáñ/測試_check file diff --git a/cmd/bisync/testdata/test_ext_paths/scenario.txt b/cmd/bisync/testdata/test_ext_paths/scenario.txt index b53656bb3..273073451 100644 --- a/cmd/bisync/testdata/test_ext_paths/scenario.txt +++ b/cmd/bisync/testdata/test_ext_paths/scenario.txt @@ -14,34 +14,34 @@ test extended-char-paths # in logs or listings, but remotes return two ASCII chars `\t`. # verify expected files, attempt to fix -fix-names {path1/}測試_Русский_{spc}_{spc}_ě_áñ{/} -fix-names {path2/}測試_Русский_{spc}_{spc}_ě_áñ{/} -fix-names {path1/}測試_Русский_{spc}_{spc}_ě_áñ/測試_check{spc}file -fix-names {path2/}測試_Русский_{spc}_{spc}_ě_áñ/測試_check{spc}file -fix-names {path1/}測試_Русский_{spc}_{spc}_ě_áñ/filename_contains_ě_.txt -fix-names {path2/}測試_Русский_{spc}_{spc}_ě_áñ/filename_contains_ě_.txt +fix-names {path1/}測試Русский{spc}{spc}ěáñ{/} +fix-names {path2/}測試Русский{spc}{spc}ěáñ{/} +fix-names {path1/}測試Русский{spc}{spc}ěáñ/測試_check{spc}file +fix-names {path2/}測試Русский{spc}{spc}ěáñ/測試_check{spc}file +fix-names {path1/}測試Русский{spc}{spc}ěáñ/filename_contains_ě_.txt +fix-names {path2/}測試Русский{spc}{spc}ěáñ/filename_contains_ě_.txt fix-names {path1/}測試_check{spc}file fix-names {path2/}測試_check{spc}file -fix-names {path1/}測試_Русский_{spc}_{spc}_ě_áñ/測試_check{spc}file -fix-names {path2/}測試_Русский_{spc}_{spc}_ě_áñ/測試_check{spc}file +fix-names {path1/}測試Русский{spc}{spc}ěáñ/測試_check{spc}file +fix-names {path2/}測試Русский{spc}{spc}ěáñ/測試_check{spc}file test resync subdirs with extended chars -bisync subdir=測試_Русский_{spc}_{spc}_ě_áñ resync +bisync subdir=測試Русский{spc}{spc}ěáñ resync copy-listings resync test place new files with extended chars on each side # force specific modification time since file time is lost through git touch-glob 2001-01-02 {datadir/} file1.txt -copy-as {datadir/}file1.txt {path1/}測試_Русский_{spc}_{spc}_ě_áñ 測試_file1p1 -copy-as {datadir/}file1.txt {path2/}測試_Русский_{spc}_{spc}_ě_áñ 測試_file1p2 +copy-as {datadir/}file1.txt {path1/}測試Русский{spc}{spc}ěáñ 測試_file1p1 +copy-as {datadir/}file1.txt {path2/}測試Русский{spc}{spc}ěáñ 測試_file1p2 test normal sync of subdirs with extended chars -bisync subdir=測試_Русский_{spc}_{spc}_ě_áñ +bisync subdir=測試Русский{spc}{spc}ěáñ move-listings normal-sync test check-filename with extended chars. check should fail. bisync resync -delete-file {path1/}測試_Русский_{spc}_{spc}_ě_áñ/測試_check{spc}file +delete-file {path1/}測試Русский{spc}{spc}ěáñ/測試_check{spc}file bisync check-access check-filename=測試_check{spc}file copy-listings check-access-fail