openstack/swift
Code Issues Proposed changes

Merge "Skip symlink + vw functional tests if symlink is not enabled"

Browse Source
This commit is contained in:
Zuul
2017-12-28 18:55:16 +00:00
committed by Gerrit Code Review
parent 61fe6aae81 0bdec4661b
commit 9e8abe46c6
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/functional/test_versioned_writes.py
View File

@@ -623,6 +623,9 @@ class TestObjectVersioning(Base):
return symlink, tgt_a return symlink, tgt_a
def test_overwriting_symlink(self): def test_overwriting_symlink(self):
if 'symlink' not in cluster_info:
raise SkipTest("Symlinks not enabled")
symlink, target = self._check_overwriting_symlink() symlink, target = self._check_overwriting_symlink()
# test delete # test delete
symlink.delete() symlink.delete()
@@ -673,6 +676,9 @@ class TestObjectVersioning(Base):
return symlink, target return symlink, target
def test_copy_destination_restore_symlink(self): def test_copy_destination_restore_symlink(self):
if 'symlink' not in cluster_info:
raise SkipTest("Symlinks not enabled")
symlink, target = self._check_copy_destination_restore_symlink() symlink, target = self._check_copy_destination_restore_symlink()
# and versioned writes restore # and versioned writes restore
symlink.delete() symlink.delete()
@@ -683,6 +689,9 @@ class TestObjectVersioning(Base):
self._assert_symlink(symlink, target) self._assert_symlink(symlink, target)
def test_put_x_copy_from_restore_symlink(self): def test_put_x_copy_from_restore_symlink(self):
if 'symlink' not in cluster_info:
raise SkipTest("Symlinks not enabled")
symlink, target = self._setup_symlink() symlink, target = self._setup_symlink()
symlink.write('this is not a symlink') symlink.write('this is not a symlink')
version_container_files = self.env.versions_container.files() version_container_files = self.env.versions_container.files()
@@ -809,6 +818,9 @@ class TestObjectVersioningHistoryMode(TestObjectVersioning):
self.assertEqual(expected, prev_version.read()) self.assertEqual(expected, prev_version.read())
def test_overwriting_symlink(self): def test_overwriting_symlink(self):
if 'symlink' not in cluster_info:
raise SkipTest("Symlinks not enabled")
symlink, target = self._check_overwriting_symlink() symlink, target = self._check_overwriting_symlink()
# test delete # test delete
symlink.delete() symlink.delete()
@@ -817,6 +829,9 @@ class TestObjectVersioningHistoryMode(TestObjectVersioning):
self.assertEqual(404, cm.exception.status) self.assertEqual(404, cm.exception.status)
def test_copy_destination_restore_symlink(self): def test_copy_destination_restore_symlink(self):
if 'symlink' not in cluster_info:
raise SkipTest("Symlinks not enabled")
symlink, target = self._check_copy_destination_restore_symlink() symlink, target = self._check_copy_destination_restore_symlink()
symlink.delete() symlink.delete()
with self.assertRaises(ResponseError) as cm: with self.assertRaises(ResponseError) as cm: