From b371b1fe3485e67b7c0c009e1833e5b1102025a2 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Sun, 18 Sep 2016 12:24:55 +0000 Subject: [PATCH] lib/versioner: Test both spaces and parens in ext versioner paths GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3610 --- lib/versioner/_external_test/external.bat | 4 ++-- lib/versioner/external_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/versioner/_external_test/external.bat b/lib/versioner/_external_test/external.bat index 712ec1033..348d89398 100644 --- a/lib/versioner/_external_test/external.bat +++ b/lib/versioner/_external_test/external.bat @@ -1,5 +1,5 @@ -set FOLDER_PATH=%~1 -set FILE_PATH=%~2 +set "FOLDER_PATH=%~1" +set "FILE_PATH=%~2" echo "1--%FOLDER_PATH%--" echo "2--%FILE_PATH%--" del "%FOLDER_PATH%\%FILE_PATH%" diff --git a/lib/versioner/external_test.go b/lib/versioner/external_test.go index abe1d7362..4b73f1554 100644 --- a/lib/versioner/external_test.go +++ b/lib/versioner/external_test.go @@ -48,7 +48,7 @@ func TestExternal(t *testing.T) { cmd = `.\_external_test\external.bat` } - file := "testdata/folder path/long filename.txt" + file := "testdata/folder path/dir (parens)/long filename (parens).txt" prepForRemoval(t, file) defer os.RemoveAll("testdata")