Move symlink versioning functional test

The functional test for versioning symlinks is better located in
test_versioned_writes where it can be added to
TestObjectVersioning. This saves duplicated versioned_writes specific
setup code in test_symlink, and has the benefit of the test being
repeated for each of the versioned writes test subclasses.  With a
small refactor this includes the test now running with
x-history-location mode as well as x-versions-location mode.

Related-Change: I838ed71bacb3e33916db8dd42c7880d5bb9f8e18
Change-Id: If215446c558b61c1a8aea37ce6be8fcb5a9ea2f4

test/functional/test_symlink.py

@@ -33,7 +33,6 @@ from test.functional.test_dlo import TestDloEnv
 from test.functional.test_tempurl import TestContainerTempurlEnv, \
     TestTempurlEnv
 from test.functional.swift_test_client import ResponseError
-from test.functional.test_versioned_writes import TestObjectVersioningEnv
 import test.functional as tf
 
 TARGET_BODY = 'target body'
@@ -1764,76 +1763,5 @@ class TestSymlinkContainerTempurl(Base):
             self.fail('request did not error')
 
 
-class TestSymlinkVersioning(Base):
-    env = TestObjectVersioningEnv
-
-    def setUp(self):
-        super(TestSymlinkVersioning, self).setUp()
-        if self.env.versioning_enabled is False:
-            raise SkipTest("Object versioning not enabled")
-        elif self.env.versioning_enabled is not True:
-            # just some sanity checking
-            raise Exception(
-                "Expected versioning_enabled to be True/False, got %r" %
-                (self.env.versioning_enabled,))
-
-    def _tear_down_files(self):
-        try:
-            # only delete files and not containers
-            # as they were configured in self.env
-            self.env.versions_container.delete_files()
-            self.env.container.delete_files()
-        except ResponseError:
-            pass
-
-    def tearDown(self):
-        super(TestSymlinkVersioning, self).tearDown()
-        self._tear_down_files()
-
-    def test_overwriting(self):
-        container = self.env.container
-        versions_container = self.env.versions_container
-
-        symlink_name = Utils.create_name()
-        tgt_a_name = Utils.create_name()
-        tgt_b_name = Utils.create_name()
-
-        tgt_a = container.file(tgt_a_name)
-        tgt_a.write("aaaaa")
-
-        tgt_b = container.file(tgt_b_name)
-        tgt_b.write("bbbbb")
-
-        symlink_name = Utils.create_name()
-        sym_tgt_header = '%s/%s' % (container.name, tgt_a_name)
-        sym_headers_a = {'X-Symlink-Target': sym_tgt_header}
-        symlink = container.file(symlink_name)
-        symlink.write("", hdrs=sym_headers_a)
-        self.assertEqual("aaaaa", symlink.read())
-
-        sym_headers_b = {'X-Symlink-Target': '%s/%s' % (container.name,
-                                                        tgt_b_name)}
-        symlink.write("", hdrs=sym_headers_b)
-        self.assertEqual("bbbbb", symlink.read())
-
-        # the old version got saved off
-        self.assertEqual(1, versions_container.info()['object_count'])
-        versioned_obj_name = versions_container.files()[0]
-        prev_version = versions_container.file(versioned_obj_name)
-        prev_version_info = prev_version.info(parms={'symlink': 'get'})
-        self.assertEqual("aaaaa", prev_version.read())
-        self.assertEqual(MD5_OF_EMPTY_STRING, prev_version_info['etag'])
-        self.assertEqual(sym_tgt_header,
-                         prev_version_info['x_symlink_target'])
-
-        # test delete
-        symlink.delete()
-        sym_info = symlink.info(parms={'symlink': 'get'})
-        self.assertEqual("aaaaa", symlink.read())
-        self.assertEqual(MD5_OF_EMPTY_STRING, sym_info['etag'])
-        self.assertEqual(sym_tgt_header,
-                         sym_info['x_symlink_target'])
-
-
 if __name__ == '__main__':
     unittest2.main()

test/functional/test_versioned_writes.py

@@ -21,6 +21,8 @@ from unittest2 import SkipTest
 
 import test.functional as tf
 from copy import deepcopy
+
+from swift.common.utils import MD5_OF_EMPTY_STRING
 from test.functional.tests import Base, Base2, BaseEnv, Utils
 from test.functional import cluster_info
 from test.functional.swift_test_client import Account, Connection, \
@@ -209,6 +211,8 @@ class TestObjectVersioning(Base):
             # as they were configured in self.env
             self.env.versions_container.delete_files()
             self.env.container.delete_files()
+            # in history mode, cleanup after deleting 'container' files
+            self.env.versions_container.delete_files()
         except ResponseError:
             pass
 
@@ -579,6 +583,53 @@ class TestObjectVersioning(Base):
         versioned_obj.delete()
         self.assertEqual("aaaaa", versioned_obj.read())
 
+    def _check_overwriting_symlink(self):
+        # assertions common to x-versions-location and x-history-location modes
+        container = self.env.container
+        versions_container = self.env.versions_container
+
+        tgt_a_name = Utils.create_name()
+        tgt_b_name = Utils.create_name()
+
+        tgt_a = container.file(tgt_a_name)
+        tgt_a.write("aaaaa")
+
+        tgt_b = container.file(tgt_b_name)
+        tgt_b.write("bbbbb")
+
+        symlink_name = Utils.create_name()
+        sym_tgt_header = '%s/%s' % (container.name, tgt_a_name)
+        sym_headers_a = {'X-Symlink-Target': sym_tgt_header}
+        symlink = container.file(symlink_name)
+        symlink.write("", hdrs=sym_headers_a)
+        self.assertEqual("aaaaa", symlink.read())
+
+        sym_headers_b = {'X-Symlink-Target': '%s/%s' % (container.name,
+                                                        tgt_b_name)}
+        symlink.write("", hdrs=sym_headers_b)
+        self.assertEqual("bbbbb", symlink.read())
+
+        # the old version got saved off
+        self.assertEqual(1, versions_container.info()['object_count'])
+        versioned_obj_name = versions_container.files()[0]
+        prev_version = versions_container.file(versioned_obj_name)
+        prev_version_info = prev_version.info(parms={'symlink': 'get'})
+        self.assertEqual("aaaaa", prev_version.read())
+        self.assertEqual(MD5_OF_EMPTY_STRING, prev_version_info['etag'])
+        self.assertEqual(sym_tgt_header,
+                         prev_version_info['x_symlink_target'])
+        return symlink, tgt_a
+
+    def test_overwriting_symlink(self):
+        symlink, target = self._check_overwriting_symlink()
+        # test delete
+        symlink.delete()
+        sym_info = symlink.info(parms={'symlink': 'get'})
+        self.assertEqual("aaaaa", symlink.read())
+        self.assertEqual(MD5_OF_EMPTY_STRING, sym_info['etag'])
+        self.assertEqual('%s/%s' % (self.env.container.name, target.name),
+                         sym_info['x_symlink_target'])
+
 
 class TestObjectVersioningUTF8(Base2, TestObjectVersioning):
 
@@ -692,6 +743,14 @@ class TestObjectVersioningHistoryMode(TestObjectVersioning):
             prev_version = self.env.versions_container.file(actual)
             self.assertEqual(expected, prev_version.read())
 
+    def test_overwriting_symlink(self):
+        symlink, target = self._check_overwriting_symlink()
+        # test delete
+        symlink.delete()
+        with self.assertRaises(ResponseError) as cm:
+            symlink.read()
+        self.assertEqual(404, cm.exception.status)
+
 
 class TestSloWithVersioning(unittest2.TestCase):