From 0fd7257fc8f933b288f352bb1b843c76d2f53674 Mon Sep 17 00:00:00 2001
From: Clay Gerrard <clay.gerrard@gmail.com>
Date: Tue, 3 Jan 2017 16:10:42 -0800
Subject: [PATCH] Fix flaky expirer probe test

This does not address the underlying lp bug #1652323 with ssync that
makes ssync inconsistent with expired objects.

Change-Id: Ia12dc27a12418637587c57ff4f5744d00c661691
Related-Bug: #1652323
Closes-Bug: #1653836
---
 test/probe/test_object_expirer.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/probe/test_object_expirer.py b/test/probe/test_object_expirer.py
index 21f984358d..c1f1b1e49d 100644
--- a/test/probe/test_object_expirer.py
+++ b/test/probe/test_object_expirer.py
@@ -286,6 +286,9 @@ class TestObjectExpirer(ReplProbeTest):
         # run expirer again, delete should now succeed
         self.expirer.once()
 
+        # this is mainly to paper over lp bug #1652323
+        self.get_to_final_state()
+
         # verify the deletion by checking the container listing
         self.assertFalse(self._check_obj_in_container_listing(),
                          msg='Found listing for %s' % self.object_name)