diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-06-04 18:13:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-04 18:13:23 +0300 |
| commit | c1171d700e2bd5fc066cb76c2b7dc6a10ae089f3 (patch) | |
| tree | 29fce31722cae86650fda8ada9b75be4f327b4fb /test | |
| parent | 3a1dc44ec85b8db23688020b5b23f7635f98be13 (diff) | |
| parent | 5f7fd7c5519d72f18ca7e6ce6fb5287c1e69aa2b (diff) | |
Merge pull request #322 from nextcloud/upstream/pr/6404
Excludes: Expand doc, Desktop.ini only in root folder
Diffstat (limited to 'test')
| -rw-r--r-- | test/csync/csync_tests/check_csync_exclude.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/csync/csync_tests/check_csync_exclude.cpp b/test/csync/csync_tests/check_csync_exclude.cpp index f719aa4aa..95b6e9a31 100644 --- a/test/csync/csync_tests/check_csync_exclude.cpp +++ b/test/csync/csync_tests/check_csync_exclude.cpp @@ -271,7 +271,8 @@ static void check_csync_excluded_traversal(void **) assert_int_equal(check_file_traversal("subdir/.sync_5bdd60bdfcfa.db"), CSYNC_FILE_SILENTLY_EXCLUDED); /* Other builtin excludes */ - assert_int_equal(check_file_traversal("foo/Desktop.ini"), CSYNC_FILE_SILENTLY_EXCLUDED); + assert_int_equal(check_file_traversal("foo/Desktop.ini"), CSYNC_NOT_EXCLUDED); + assert_int_equal(check_file_traversal("Desktop.ini"), CSYNC_FILE_SILENTLY_EXCLUDED); /* pattern ]*.directory - ignore and remove */ assert_int_equal(check_file_traversal("my.~directory"), CSYNC_FILE_EXCLUDE_AND_REMOVE); |