From 5bc55338f5a1645bc651811fae2f89ad855ff86e Mon Sep 17 00:00:00 2001
From: David Zafman <dzafman@redhat.com>
Date: Thu, 19 May 2016 22:22:09 -0700
Subject: [PATCH] test: Disable tests due to recovery race

Disable:
osd-scrub-repair.sh
test-erasure-eio.sh
test-erasure-code.sh

These test are failing due to race conditions that is exposing
bug http://tracker.ceph.com/issues/13937.

Signed-off-by: David Zafman <dzafman@redhat.com>
---
 src/test/Makefile.am                 | 1 -
 src/test/erasure-code/CMakeLists.txt | 3 ---
 src/test/erasure-code/Makefile.am    | 4 +---
 src/test/osd/CMakeLists.txt          | 1 -
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index fb30394db3955..20c6141ff3187 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -82,7 +82,6 @@ check_SCRIPTS += \
 	test/mon/mkfs.sh \
 	test/mon/mon-scrub.sh \
        test/mon/test_pool_quota.sh \
-	test/osd/osd-scrub-repair.sh \
 	test/osd/osd-scrub-snaps.sh \
 	test/osd/osd-config.sh \
 	test/osd/osd-reuse-id.sh \
diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
index 77ec6516c0792..ed6429f5d33f9 100644
--- a/src/test/erasure-code/CMakeLists.txt
+++ b/src/test/erasure-code/CMakeLists.txt
@@ -1,7 +1,4 @@
 
-add_ceph_test(test-erasure-code.sh ${CMAKE_CURRENT_SOURCE_DIR}/test-erasure-code.sh)
-add_ceph_test(test-erasure-eio.sh ${CMAKE_CURRENT_SOURCE_DIR}/test-erasure-eio.sh)
-
 add_executable(ceph_erasure_code_benchmark 
   ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc
   ceph_erasure_code_benchmark.cc)
diff --git a/src/test/erasure-code/Makefile.am b/src/test/erasure-code/Makefile.am
index 3c45c67c61c36..72ce1ba5cee74 100644
--- a/src/test/erasure-code/Makefile.am
+++ b/src/test/erasure-code/Makefile.am
@@ -1,9 +1,7 @@
 if ENABLE_SERVER
 if WITH_OSD
 
-check_SCRIPTS += \
-	test/erasure-code/test-erasure-code.sh \
-	test/erasure-code/test-erasure-eio.sh
+check_SCRIPTS =
 
 noinst_HEADERS += \
 	test/erasure-code/ceph_erasure_code_benchmark.h
diff --git a/src/test/osd/CMakeLists.txt b/src/test/osd/CMakeLists.txt
index d7cdb7eea8a8e..1278675fc70db 100644
--- a/src/test/osd/CMakeLists.txt
+++ b/src/test/osd/CMakeLists.txt
@@ -20,7 +20,6 @@ add_ceph_test(osd-config.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-config.sh)
 add_ceph_test(osd-markdown.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-markdown.sh) 
 add_ceph_test(osd-reactivate.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-reactivate.sh) 
 add_ceph_test(osd-reuse-id.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-reuse-id.sh)
-add_ceph_test(osd-scrub-repair.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-scrub-repair.sh) 
 add_ceph_test(osd-scrub-snaps.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-scrub-snaps.sh)
 
 #osd-copy-from.sh needs to be run out of ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-- 
2.39.5