]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
tests: do not use memstore.test_temp_dir in two tests 12281/head
authorLoic Dachary <ldachary@redhat.com>
Fri, 2 Dec 2016 15:58:29 +0000 (16:58 +0100)
committerLoic Dachary <ldachary@redhat.com>
Tue, 6 Dec 2016 08:12:50 +0000 (09:12 +0100)
unittest_memstore_clone and test_objectstore_memstore.sh both
use memstore.test_temp_dir and when running in parallel they
interfere with each other.

src/test/objectstore/store_test_fixture.h will create

   memstore.test_temp_dir

when running via src/test/test_objectstore_memstore.sh

src/test/objectstore/test_memstore_clone.cc will also create

   memstore.test_temp_dir

when running via unittest_memstore_clone.

Fixes: http://tracker.ceph.com/issues/17743
Signed-off-by: Loic Dachary <loic@dachary.org>
src/test/objectstore/test_memstore_clone.cc

index 6607530f032557ba4b11a10c480cb8caa2761e82..26c0f9f2557e99a9664808bb36d7fac1bbd016e0 100644 (file)
@@ -178,7 +178,7 @@ int main(int argc, char** argv)
   // default to memstore
   vector<const char*> defaults{
     "--osd_objectstore", "memstore",
-    "--osd_data", "memstore.test_temp_dir",
+    "--osd_data", "msc.test_temp_dir",
     "--memstore_page_size", "4",
   };