From 4b93188de271837c4a98d26e1812f7d06e543cd8 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Aug 13 2018 20:54:32 +0000 Subject: more checks in unit test --- diff --git a/tests/test_hub/test_ensure_volume_symlink.py b/tests/test_hub/test_ensure_volume_symlink.py index 9473656..e0acdf5 100644 --- a/tests/test_hub/test_ensure_volume_symlink.py +++ b/tests/test_hub/test_ensure_volume_symlink.py @@ -57,20 +57,34 @@ class TestEnsureVolumeSymlink(unittest.TestCase): logger.warn.assert_called_once() def test_volume_symlink_create(self): + basedir = self.pathinfo.build(self.buildinfo) # default volume self.buildinfo['volume_name'] = 'test' self.buildinfo['volume_id'] = 1 kojihub.ensure_volume_symlink(self.buildinfo) - # TODO: check files + files = list(find_files(self.tempdir)) + expected = [ + 'packages', + 'packages/some-image', + 'packages/some-image/1.2.3.4', + 'packages/some-image/1.2.3.4/3', + ] + self.assertEqual(files, expected) + relpath = ('../../../vol/test/packages/' + '%(name)s/%(version)s/%(release)s' % self.buildinfo) + self.assertEqual(os.readlink(basedir), relpath) + def test_volume_symlink_exists(self): basedir = self.pathinfo.build(self.buildinfo) # default volume - relpath = 'some/other/link' + oldpath = 'some/other/link' os.makedirs(os.path.dirname(basedir)) - os.symlink(relpath, basedir) + os.symlink(oldpath, basedir) self.buildinfo['volume_name'] = 'test' self.buildinfo['volume_id'] = 1 kojihub.ensure_volume_symlink(self.buildinfo) - # TODO: check files + relpath = ('../../../vol/test/packages/' + '%(name)s/%(version)s/%(release)s' % self.buildinfo) + self.assertEqual(os.readlink(basedir), relpath) def test_volume_symlink_exists_same(self): basedir = self.pathinfo.build(self.buildinfo) # default volume @@ -83,7 +97,14 @@ class TestEnsureVolumeSymlink(unittest.TestCase): with mock.patch('os.unlink') as unlink: kojihub.ensure_volume_symlink(self.buildinfo) unlink.assert_not_called() - # TODO: check files + files = list(find_files(self.tempdir)) + expected = [ + 'packages', + 'packages/some-image', + 'packages/some-image/1.2.3.4', + 'packages/some-image/1.2.3.4/3', + ] + self.assertEqual(files, expected) def test_volume_symlink_exists_error(self): basedir = self.pathinfo.build(self.buildinfo) # default volume