zuul/zuul-jobs
Code Issues Proposed changes

Merge "Fix cleanup of symlink fixtures"

Browse Source
This commit is contained in:
Zuul 2020-02-25 16:46:09 +00:00 committed by Gerrit Code Review
commit fe15bf4934
4 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
roles/generate-zuul-manifest/library/test_generate_manifest.py
View File

@ -43,17 +43,10 @@ class SymlinkFixture(fixtures.Fixture):
] ]
def _setUp(self): def _setUp(self):
self._cleanup()
for (src, target) in self.links: for (src, target) in self.links:
path = os.path.join(FIXTURE_DIR, 'links', src) path = os.path.join(FIXTURE_DIR, 'links', src)
os.symlink(target, path) os.symlink(target, path)
self.addCleanup(self._cleanup) self.addCleanup(os.unlink, path)
def _cleanup(self):
for (src, target) in self.links:
path = os.path.join(FIXTURE_DIR, 'links', src)
if os.path.exists(path):
os.unlink(path)
class TestFileList(testtools.TestCase): class TestFileList(testtools.TestCase):

9
roles/test-upload-logs-swift/library/test_zuul_swift_upload.py
View File

@ -44,17 +44,10 @@ class SymlinkFixture(fixtures.Fixture):
] ]
def _setUp(self): def _setUp(self):
self._cleanup()
for (src, target) in self.links: for (src, target) in self.links:
path = os.path.join(FIXTURE_DIR, 'links', src) path = os.path.join(FIXTURE_DIR, 'links', src)
os.symlink(target, path) os.symlink(target, path)
self.addCleanup(self._cleanup) self.addCleanup(os.unlink, path)
def _cleanup(self):
for (src, target) in self.links:
path = os.path.join(FIXTURE_DIR, 'links', src)
if os.path.exists(path):
os.unlink(path)
class TestFileList(testtools.TestCase): class TestFileList(testtools.TestCase):

9
roles/upload-logs-gcs/library/test_zuul_google_storage_upload.py
View File

@ -44,17 +44,10 @@ class SymlinkFixture(fixtures.Fixture):
] ]
def _setUp(self): def _setUp(self):
self._cleanup()
for (src, target) in self.links: for (src, target) in self.links:
path = os.path.join(FIXTURE_DIR, 'links', src) path = os.path.join(FIXTURE_DIR, 'links', src)
os.symlink(target, path) os.symlink(target, path)
self.addCleanup(self._cleanup) self.addCleanup(os.unlink, path)
def _cleanup(self):
for (src, target) in self.links:
path = os.path.join(FIXTURE_DIR, 'links', src)
if os.path.exists(path):
os.unlink(path)
class TestFileList(testtools.TestCase): class TestFileList(testtools.TestCase):

9
roles/upload-logs-swift/library/test_zuul_swift_upload.py
View File

@ -44,17 +44,10 @@ class SymlinkFixture(fixtures.Fixture):
] ]
def _setUp(self): def _setUp(self):
self._cleanup()
for (src, target) in self.links: for (src, target) in self.links:
path = os.path.join(FIXTURE_DIR, 'links', src) path = os.path.join(FIXTURE_DIR, 'links', src)
os.symlink(target, path) os.symlink(target, path)
self.addCleanup(self._cleanup) self.addCleanup(os.unlink, path)
def _cleanup(self):
for (src, target) in self.links:
path = os.path.join(FIXTURE_DIR, 'links', src)
if os.path.exists(path):
os.unlink(path)
class TestFileList(testtools.TestCase): class TestFileList(testtools.TestCase):