From ae007688d8f1f57b138dafffdfc3683aa7c7730f Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Fri, 20 Jun 2014 14:37:30 +0000 Subject: Don't attempt to load symlinks as morphologies This was noticed because our definitions.git had a dangling symlink, so it failed to construct the temporary build branch. We shouldn't process symlinks as morphologies either, since either we make symlinked morphologies a first-class behaviour, and validate that the link points inside the repository, which is a lot of work for something we don't and probably won't need; or we can just assume that we deal with the morphology this is linked to correctly anyway. --- morphlib/gitdir_tests.py | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'morphlib/gitdir_tests.py') diff --git a/morphlib/gitdir_tests.py b/morphlib/gitdir_tests.py index 14b2a57a..b3b4a8ab 100644 --- a/morphlib/gitdir_tests.py +++ b/morphlib/gitdir_tests.py @@ -216,6 +216,43 @@ class GitDirectoryContentsTests(unittest.TestCase): self.assertEqual(gd.describe(), 'example') +class GitDirectoryFileTypeTests(unittest.TestCase): + + def setUp(self): + self.tempdir = tempfile.mkdtemp() + self.dirname = os.path.join(self.tempdir, 'foo') + os.mkdir(self.dirname) + gd = morphlib.gitdir.init(self.dirname) + with open(os.path.join(self.dirname, 'file'), "w") as f: + f.write('dummy morphology text') + os.symlink('file', os.path.join(self.dirname, 'link')) + os.symlink('no file', os.path.join(self.dirname, 'broken')) + gd._runcmd(['git', 'add', '.']) + gd._runcmd(['git', 'commit', '-m', 'Initial commit']) + self.mirror = os.path.join(self.tempdir, 'mirror') + gd._runcmd(['git', 'clone', '--mirror', self.dirname, self.mirror]) + + def tearDown(self): + shutil.rmtree(self.tempdir) + + def test_working_tree_symlinks(self): + gd = morphlib.gitdir.GitDirectory(self.dirname) + self.assertTrue(gd.is_symlink('link')) + self.assertTrue(gd.is_symlink('broken')) + self.assertFalse(gd.is_symlink('file')) + + def test_bare_symlinks(self): + gd = morphlib.gitdir.GitDirectory(self.mirror) + self.assertTrue(gd.is_symlink('link', 'HEAD')) + self.assertTrue(gd.is_symlink('broken', 'HEAD')) + self.assertFalse(gd.is_symlink('file', 'HEAD')) + + def test_is_symlink_raises_no_ref_no_work_tree(self): + gd = morphlib.gitdir.GitDirectory(self.mirror) + self.assertRaises(morphlib.gitdir.NoWorkingTreeError, + gd.is_symlink, 'file') + + class GitDirectoryRefTwiddlingTests(unittest.TestCase): def setUp(self): -- cgit v1.2.1