move rmdirs to avoid failure

* on some systems (with NFS involved) you can't remove
  a directory while you hold open files that lived in
  the directory even though the files themselves are
  unlinked.  Work around this problem by calling rmdir
  before a test starts and after all tests instead of
  at the start of the fixture destructor.

1 files changed, 3 insertions, 2 deletions

diff --git a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
index 1764d6f2996..6b6abe5bc09 100644
--- a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
@@ -135,6 +135,7 @@ struct Fixture
           _views(),
           _configurer()
     {
+        vespalib::rmdir(BASE_DIR, true);
         vespalib::mkdir(BASE_DIR);
         initViewSet(_views);
         _configurer.reset(new Configurer(_views._summaryMgr,
@@ -146,7 +147,6 @@ struct Fixture
                                          0));
     }
     ~Fixture() {
-        vespalib::rmdir(BASE_DIR, true);
     }
     void initViewSet(ViewSet &views);
 };
@@ -293,11 +293,11 @@ struct FastAccessFixture
           _configurer(_view._feedView,
                   IAttributeAdapterFactory::UP(new AttributeAdapterFactory), "test")
     {
+        vespalib::rmdir(BASE_DIR, true);
         vespalib::mkdir(BASE_DIR);
     }
     ~FastAccessFixture() {
         _writeService.sync();
-        vespalib::rmdir(BASE_DIR, true);
     }
 };
 
@@ -608,4 +608,5 @@ TEST_F("require that we can reconfigure matchers", Fixture)
 TEST_MAIN()
 {
     TEST_RUN_ALL();
+    vespalib::rmdir(BASE_DIR, true);
 }