From dbabc2c8d89eb5c7f6cefe16d77a654b7abdcade Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Mon, 26 Jun 2017 09:01:15 -0400 Subject: [PATCH] ReindexIT: Allow insecure directory deletion Guava really wants you to pass this argument on Darwin, otherwise it'll fail with "unable to guarantee security of recursive delete". Change-Id: Iac98e34fecc107c2971ea772bde6b24ba0217867 --- .../test/java/com/google/gerrit/acceptance/pgm/ReindexIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ReindexIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ReindexIT.java index 1aa600b5a8..8a4aff26af 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ReindexIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ReindexIT.java @@ -17,6 +17,7 @@ package com.google.gerrit.acceptance.pgm; import static com.google.common.truth.Truth8.assertThat; import com.google.common.io.MoreFiles; +import com.google.common.io.RecursiveDeleteOption; import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.StandaloneSiteTest; import com.google.gerrit.elasticsearch.testing.ElasticTestUtils; @@ -66,7 +67,7 @@ public class ReindexIT extends StandaloneSiteTest { changeId = gApi.changes().create(in).info().changeId; } - MoreFiles.deleteRecursively(sitePaths.index_dir); + MoreFiles.deleteRecursively(sitePaths.index_dir, RecursiveDeleteOption.ALLOW_INSECURE); Files.createDirectory(sitePaths.index_dir); assertServerStartupFails();