From 21a7b4aaa6f991c0eeb8f74876b14fe22713586b Mon Sep 17 00:00:00 2001
From: Alistair Coles <alistair.coles@hp.com>
Date: Mon, 3 Aug 2015 14:58:24 +0100
Subject: [PATCH] Test that get_hashes ignores only removed hash dir

Add test for case not yet covered by unit tests: suffix dir
has two hash dirs, one with expired tombstone. That hash dir gets
removed and its hash is not included in the suffix hash, but the
remaining hash dir's hash is reported.

Change-Id: I031a022daed6b8a66dfd04bea1b4d5eebcb882b3
---
 test/unit/obj/test_diskfile.py | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/test/unit/obj/test_diskfile.py b/test/unit/obj/test_diskfile.py
index 4f64eb8aba..2ab98307fd 100644
--- a/test/unit/obj/test_diskfile.py
+++ b/test/unit/obj/test_diskfile.py
@@ -4253,6 +4253,37 @@ class TestSuffixHashes(unittest.TestCase):
             hashes = df_mgr.get_hashes('sda1', '0', [], policy)
             self.assertEqual(hashes, {})
 
+    def test_hash_suffix_one_reclaim_and_one_valid_tombstone(self):
+        for policy in self.iter_policies():
+            paths, suffix = find_paths_with_matching_suffixes(2, 1)
+            df_mgr = self.df_router[policy]
+            a, c, o = paths[suffix][0]
+            df1 = df_mgr.get_diskfile(
+                'sda1', '0', a, c, o, policy=policy)
+            # scale back this tests manager's reclaim age a bit
+            df_mgr.reclaim_age = 1000
+            # write one tombstone that's just a *little* older
+            df1.delete(Timestamp(time() - 1001))
+            # create another tombstone in same suffix dir that's newer
+            a, c, o = paths[suffix][1]
+            df2 = df_mgr.get_diskfile(
+                'sda1', '0', a, c, o, policy=policy)
+            t_df2 = Timestamp(time() - 900)
+            df2.delete(t_df2)
+
+            hashes = df_mgr.get_hashes('sda1', '0', [], policy)
+
+            suffix = os.path.basename(os.path.dirname(df1._datadir))
+            df2_tombstone_hash = md5(t_df2.internal + '.ts').hexdigest()
+            expected = {
+                REPL_POLICY: {suffix: df2_tombstone_hash},
+                EC_POLICY: {suffix: {
+                    # fi is None here because we have a tombstone
+                    None: df2_tombstone_hash}},
+            }[policy.policy_type]
+
+            self.assertEqual(hashes, expected)
+
     def test_hash_suffix_one_datafile(self):
         for policy in self.iter_policies():
             df_mgr = self.df_router[policy]