From 20ba3174bbf33f0a33d934d432401cb0136a50fc Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Thu, 23 Feb 2017 11:48:14 -0700
Subject: [PATCH] Fix the object store set metadata functional test

The metadata set functional test is seems to be failing
because scheduled deletes are not available on the test
gate.  The test is cool, but not really required because
the custom and system metadata sets are covered in other
test cases.

Partial-bug: #1665495

Change-Id: I321dca1657ba31722e5806c83ff457bb1339a370
---
 .../tests/functional/object_store/v1/test_obj.py  | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/openstack/tests/functional/object_store/v1/test_obj.py b/openstack/tests/functional/object_store/v1/test_obj.py
index a96a18eed..89990f20c 100644
--- a/openstack/tests/functional/object_store/v1/test_obj.py
+++ b/openstack/tests/functional/object_store/v1/test_obj.py
@@ -71,25 +71,14 @@ class TestObject(base.BaseFunctionalTest):
         self.assertEqual('attachment', obj.content_disposition)
         self.assertEqual('deflate', obj.content_encoding)
 
-        # set system metadata and custom metadata
-        self.conn.object_store.set_object_metadata(
-            obj, k0='v0', delete_after=100)
+        # set custom metadata
+        self.conn.object_store.set_object_metadata(obj, k0='v0')
         obj = self.conn.object_store.get_object_metadata(obj)
         self.assertIn('k0', obj.metadata)
         self.assertEqual('v0', obj.metadata['k0'])
         self.assertEqual('attachment', obj.content_disposition)
         self.assertEqual('deflate', obj.content_encoding)
 
-        # unset system metadata
-        self.conn.object_store.delete_object_metadata(
-            obj, keys=['delete_after'])
-        obj = self.conn.object_store.get_object_metadata(obj)
-        self.assertIn('k0', obj.metadata)
-        self.assertEqual('v0', obj.metadata['k0'])
-        self.assertEqual('attachment', obj.content_disposition)
-        self.assertEqual('deflate', obj.content_encoding)
-        self.assertIsNone(obj.delete_at)
-
         # unset more system metadata
         self.conn.object_store.delete_object_metadata(
             obj, keys=['content_disposition'])