From 5ce351c492b491a4a9a1edc02389bc184371050a Mon Sep 17 00:00:00 2001
From: Steve Martinelli <s.martinelli@gmail.com>
Date: Thu, 30 Jun 2016 13:30:01 +0000
Subject: [PATCH] Unskip the tests affected by warlock 1.3.0

1) This reverts commit 044a46ed5f040020cf80adc1ace987802344e87d
which was broken by warlock 1.3.0

Change-Id: Ia286d9394586884018c4e62cf581e39a809f5545
---
 functional/tests/image/v2/test_image.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/functional/tests/image/v2/test_image.py b/functional/tests/image/v2/test_image.py
index c2524f8ad0..809451bb74 100644
--- a/functional/tests/image/v2/test_image.py
+++ b/functional/tests/image/v2/test_image.py
@@ -13,8 +13,6 @@
 import os
 import uuid
 
-import testtools
-
 from functional.common import test
 
 
@@ -68,7 +66,6 @@ class ImageTests(test.TestCase):
         raw_output = self.openstack('image show ' + self.NAME + opts)
         self.assertEqual(self.NAME + "\na='b', c='d'\n", raw_output)
 
-    @testtools.skip("skip until bug 1596573 is resolved")
     def test_image_unset(self):
         opts = self.get_opts(["name", "tags", "properties"])
         self.openstack('image set --tag 01 ' + self.NAME)