A simple patch to skip a set of probe tests when there is no container-reconciler.conf file present.

skip-on-no-container-reconciler.diff

diff --git a/test/probe/test_container_merge_policy_index.py b/test/probe/test_container_merge_policy_index.py
index 5a5054c..b44ecc3 100644
--- a/test/probe/test_container_merge_policy_index.py
+++ b/test/probe/test_container_merge_policy_index.py
@@ -175,7 +175,11 @@ class TestContainerMergePolicyIndex(unittest.TestCase):
 
     def setUp(self):
         if len(POLICIES) < 2:
-            raise SkipTest()
+            raise SkipTest("Multiple storage policies not present")
+        if not os.path.exists('/etc/swift/container-reconciler.conf'):
+            raise SkipTest("Container reconciler configuration file,"
+                           " '/etc/swift/container-reconciler.conf',"
+                           " not present")
         (self.pids, self.port2server, self.account_ring, self.container_ring,
          self.object_ring, self.policy, self.url, self.token,
          self.account, self.configs) = reset_environment()