From 0bdec4661b5609ca1bf813a7ccd514e5d444b07f Mon Sep 17 00:00:00 2001 From: Kazuhiro MIYAHARA Date: Mon, 25 Dec 2017 09:13:17 +0000 Subject: [PATCH] Skip symlink + vw functional tests if symlink is not enabled Functional tests for symlink and versioned writes run and result in falure even if symlink is not enabled. This patch fixes the functional tests to run only if both of symlink and versioned writes are enabled. Change-Id: I5ffd0b6436e56a805784baf5ceb722effdf74884 --- test/functional/test_versioned_writes.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test/functional/test_versioned_writes.py b/test/functional/test_versioned_writes.py index b29e645299..0242722355 100644 --- a/test/functional/test_versioned_writes.py +++ b/test/functional/test_versioned_writes.py @@ -623,6 +623,9 @@ class TestObjectVersioning(Base): return symlink, tgt_a def test_overwriting_symlink(self): + if 'symlink' not in cluster_info: + raise SkipTest("Symlinks not enabled") + symlink, target = self._check_overwriting_symlink() # test delete symlink.delete() @@ -673,6 +676,9 @@ class TestObjectVersioning(Base): return symlink, target 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() # and versioned writes restore symlink.delete() @@ -683,6 +689,9 @@ class TestObjectVersioning(Base): self._assert_symlink(symlink, target) 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.write('this is not a symlink') version_container_files = self.env.versions_container.files() @@ -809,6 +818,9 @@ class TestObjectVersioningHistoryMode(TestObjectVersioning): self.assertEqual(expected, prev_version.read()) def test_overwriting_symlink(self): + if 'symlink' not in cluster_info: + raise SkipTest("Symlinks not enabled") + symlink, target = self._check_overwriting_symlink() # test delete symlink.delete() @@ -817,6 +829,9 @@ class TestObjectVersioningHistoryMode(TestObjectVersioning): self.assertEqual(404, cm.exception.status) 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.delete() with self.assertRaises(ResponseError) as cm: