From e332573fe1b75c45c3cfeb1fbea951a6e8d33d1d Mon Sep 17 00:00:00 2001 From: Kurtis Rader Date: Sat, 15 Apr 2017 22:28:59 -0700 Subject: [PATCH] remove transitory test directory Reinstatate a command to remove a temporary directory that inadvertently removed by commit 49518b71. --- src/fish_tests.cpp | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp index 69c92c652..3be5eac68 100644 --- a/src/fish_tests.cpp +++ b/src/fish_tests.cpp @@ -2299,17 +2299,29 @@ static void test_autosuggest_suggest_special() { if (system("mkdir -p 'test/autosuggest_test/1foo bar'")) err(L"mkdir failed"); if (system("mkdir -p 'test/autosuggest_test/2foo bar'")) err(L"mkdir failed"); if (system("mkdir -p 'test/autosuggest_test/3foo\\bar'")) err(L"mkdir failed"); - if (system("mkdir -p test/autosuggest_test/4foo\\'bar")) + if (system("mkdir -p test/autosuggest_test/4foo\\'bar")) { err(L"mkdir failed"); // a path with a single quote - if (system("mkdir -p test/autosuggest_test/5foo\\\"bar")) + } + if (system("mkdir -p test/autosuggest_test/5foo\\\"bar")) { err(L"mkdir failed"); // a path with a double quote - if (system("mkdir -p ~/test_autosuggest_suggest_special/")) - err(L"mkdir failed"); // make sure tilde is handled - if (system("mkdir -p test/autosuggest_test/start/unique2/unique3/multi4")) err(L"mkdir failed"); - if (system("mkdir -p test/autosuggest_test/start/unique2/unique3/multi42")) + } + // This is to ensure tilde expansion is handled. See the `cd ~/test_autosuggest_suggest_specia` + // test below. I really dislike this since it mucks with a persons home directory. + // + // The question is how to modify the test so that tilde expansion can be made hermetic to this + // test. + if (system("mkdir -p ~/test_autosuggest_suggest_special/")) { err(L"mkdir failed"); - if (system("mkdir -p test/autosuggest_test/start/unique2/.hiddenDir/moreStuff")) + } + if (system("mkdir -p test/autosuggest_test/start/unique2/unique3/multi4")) { err(L"mkdir failed"); + } + if (system("mkdir -p test/autosuggest_test/start/unique2/unique3/multi42")) { + err(L"mkdir failed"); + } + if (system("mkdir -p test/autosuggest_test/start/unique2/.hiddenDir/moreStuff")) { + err(L"mkdir failed"); + } const wcstring wd = L"test/autosuggest_test"; const env_vars_snapshot_t &vars = env_vars_snapshot_t::current(); @@ -2379,6 +2391,7 @@ static void test_autosuggest_suggest_special() { perform_one_autosuggestion_cd_test(L"cd ~hahaha/", vars, L"path1/path2/", __LINE__); popd(); + system("rmdir ~/test_autosuggest_suggest_special/"); } static void perform_one_autosuggestion_should_ignore_test(const wcstring &command, long line) {