Merge "Fixups for ghost listing fix"

Author: Jenkins

swift/obj/updater.py

@@ -271,7 +271,7 @@ def object_update(self, node, part, op, obj, headers_out):
                 resp.read()
                 success = is_success(resp.status)
                 if not success:
-                    self.logger.error(
+                    self.logger.debug(
                         _('Error code %(status)d is returned from remote '
                           'server %(ip)s: %(port)s / %(device)s'),
                         {'status': resp.status, 'ip': node['ip'],

test/probe/test_object_async_update.py

@@ -109,6 +109,9 @@ def test_missing_container(self):
             self.assertFalse(direct_client.direct_get_container(
                 cnode, cpart, self.account, container)[1])
 
+        # since the container is empty - we can delete it!
+        client.delete_container(self.url, self.token, container)
+
         # Re-run the object-updaters and now container replicas in primary
         # container servers should get updated
         Manager(['object-updater']).once()