Skip to content

[stable14] Include empty directories in the default state of acceptance tests - #11283

Merged
blizzz merged 1 commit into
stable14from
stable14-11268-include-empty-directories-in-the-default-state-of-acceptance-tests
Sep 19, 2018
Merged

[stable14] Include empty directories in the default state of acceptance tests#11283
blizzz merged 1 commit into
stable14from
stable14-11268-include-empty-directories-in-the-default-state-of-acceptance-tests

Conversation

@danxuliu

Copy link
Copy Markdown
Member

Backport of #11268

Before each scenario of the acceptance tests is run the Nextcloud server
is reset to a default state. To do this the full directory of the
Nextcloud server is commited to a local Git repository and then reset to
that commit when needed.
Unfortunately, Git does not support including empty directories in a
commit. Due to this, when the default state was restored, it could
happen that the file cache listed an empty directory that did not exist
because it was not properly restored (for example,
"data/appdata_*/css/icons"), and that in turn could lead to an error
when the directory was used.
Currently the only way to force Git to include an empty directory is to
add a dummy file to the directory (so it will no longer be empty,
but that should not be a problem in the affected directories, even if
the dummy file is not included in the file cache); although Git FAQ
suggests using a ".gitignore" file a ".keep" file was used instead, as
it conveys better its purpose.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliudanxuliu added bug 3. to review Waiting for reviews labels Sep 19, 2018
@danxuliudanxuliu added this to the Nextcloud 14.0.1 milestone Sep 19, 2018
@blizzz
blizzz merged commit bea36f9 into stable14Sep 19, 2018
@nickvergessennickvergessen mentioned this pull request Sep 19, 2018
@MorrisJobke
MorrisJobke deleted the stable14-11268-include-empty-directories-in-the-default-state-of-acceptance-tests branch October 1, 2018 09:03
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsbug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@danxuliu@blizzz@skjnldsv