Merge lp:~elopio/snapcraft/symlinks into lp:~snappy-dev/snapcraft/core

[Leo Arias]

Joined the ubuntu plugin unit tests.

I found another ubuntu plugin tests file. IMO, it's better to keep all the tests in the same directory, so I moved them to snapcraft/tests. If we add many tests for plugins, we can make a directory snapcraft/tests/plugins.

[lp:~elopio/snapcraft/symlinks]

132. By Leo Arias on 2015-08-06

Fixed flakes.

133. By Leo Arias on 2015-08-06

Clear the test values.

[Sergio Schvezov (sergiusens)]

I'm going to reject this as it is no longer as relevant with filesets.

review: Disapprove

Unmerged revisions

133. By Leo Arias on 2015-08-06

Clear the test values.

132. By Leo Arias on 2015-08-06

Fixed flakes.

131. By Leo Arias on 2015-08-06

Use scenarios for symlinks.

130. By Leo Arias on 2015-08-06

Joined the ubuntu plugin unit tests.

=== removed directory 'snapcraft/plugins/tests'
=== removed file 'snapcraft/plugins/tests/__init__.py'
=== removed file 'snapcraft/plugins/tests/test_ubuntu.py'
--- snapcraft/plugins/tests/test_ubuntu.py	2015-08-06 01:00:44 +0000
+++ snapcraft/plugins/tests/test_ubuntu.py	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*-
-#
-# Copyright (C) 2015 Canonical Ltd
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-import tempfile
-from unittest.mock import (
-    Mock,
-)
-
-from snapcraft.plugins.ubuntu import UbuntuPlugin
-
-from snapcraft.tests import TestCase
-
-
-class TestUbuntu(TestCase):
-
-    def test_fix_symlinks(self):
-        tempdirObj = tempfile.TemporaryDirectory()
-        self.addCleanup(tempdirObj.cleanup)
-        tempdir = tempdirObj.name
-
-        os.makedirs(tempdir + '/a')
-        open(tempdir + '/1', mode='w').close()
-
-        os.symlink('a', tempdir + '/rel-to-a')
-        os.symlink('/a', tempdir + '/abs-to-a')
-        os.symlink('/b', tempdir + '/abs-to-b')
-        os.symlink('1', tempdir + '/rel-to-1')
-        os.symlink('/1', tempdir + '/abs-to-1')
-
-        options = Mock()
-        options.packages = ['test']
-        ubuntu = UbuntuPlugin('ubuntu', options)
-        ubuntu.fix_symlinks(debdir=tempdir)
-
-        self.assertEqual(os.readlink(tempdir + '/rel-to-a'), 'a')
-        self.assertEqual(os.readlink(tempdir + '/abs-to-a'), 'a')
-        self.assertEqual(os.readlink(tempdir + '/abs-to-b'), '/b')
-        self.assertEqual(os.readlink(tempdir + '/rel-to-1'), '1')
-        self.assertEqual(os.readlink(tempdir + '/abs-to-1'), '1')
-
-    def test_recommends_ignored_properly(self):
-        class Options:
-            packages = ['my-excellent-package']
-        ubuntu = UbuntuPlugin('myplug', Options())
-
-        self.assertTrue('my-excellent-package' in ubuntu.included_packages)
-        self.assertEqual(ubuntu.recommends, None)

=== modified file 'snapcraft/tests/test_ubuntu_plugin.py'
--- snapcraft/tests/test_ubuntu_plugin.py	2015-08-05 20:19:47 +0000
+++ snapcraft/tests/test_ubuntu_plugin.py	2015-08-06 18:24:36 +0000
@@ -15,6 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
+import os
 
 import fixtures
 
@@ -22,14 +23,28 @@
 from snapcraft.plugins import ubuntu
 
 
+class Options:
+
+    def __init__(self, packages=None, recommends=None):
+        self.packages = packages
+        self.recommends = recommends
+
+
 class UbuntuPluginTestCase(tests.TestCase):
 
+    def test_recommends_ignored_properly(self):
+        plugin = ubuntu.UbuntuPlugin(
+            'test-plugin', Options(packages=['test-package']))
+
+        self.assertTrue('test-package' in plugin.included_packages)
+        self.assertEqual(plugin.recommends, None)
+
     def test_get_all_dep_packages_with_unrecognized_package(self):
         fake_logger = fixtures.FakeLogger(level=logging.ERROR)
         self.useFixture(fake_logger)
 
-        test_options = type('obj', (object,), {'packages': False, 'recommends': False})
-        plugin = ubuntu.UbuntuPlugin('test_plugin', test_options)
+        plugin = ubuntu.UbuntuPlugin(
+            'test_plugin', Options(packages=['other-test-package']))
 
         with self.assertRaises(SystemExit) as raised:
             plugin.get_all_dep_packages(['test_package'])
@@ -37,3 +52,53 @@
         self.assertEqual(raised.exception.code, 1, 'Wrong exit code returned.')
         self.assertEqual(
             "Package 'test_package' not recognized\n", fake_logger.output)
+
+
+class FixFileSymlinksTestCase(tests.TestCase):
+
+    scenarios = [
+        ('relative_file_path', {
+            'source_name': 'test_source_file',
+            'abs_source': False,
+            'type_': 'file',
+            'expected_link': 'test_source_file'}),
+        ('absolute_file_path', {
+            'source_name': 'test_source_file',
+            'abs_source': True,
+            'type_': 'file',
+            'expected_link': 'test_source_file'}),
+        ('relative_dir_path', {
+            'source_name': 'test_source_dir',
+            'abs_source': False,
+            'type_': 'dir',
+            'expected_link': 'test_source_dir'}),
+        ('absolute_dir_path', {
+            'source_name': 'test_source_dir',
+            'abs_source': True,
+            'type_': 'dir',
+            'expected_link': 'test_source_dir'}),
+        ('absolute_unexisting_path', {
+            'source_name': 'unexisting_test_source',
+            'abs_source': True,
+            'type_': 'unexisting',
+            'expected_link': '/unexisting_test_source'})
+    ]
+
+    def test_fix_symliks(self):
+        if self.abs_source:
+            source_path = '/' + self.source_name
+        else:
+            source_path = self.source_name
+
+        if self.type_ == 'file':
+            open(self.source_name, 'w').close()
+        elif self.type_ == 'dir':
+            os.mkdir(self.source_name)
+
+        link_name = 'test_link_name'
+        os.symlink(source_path, link_name)
+        plugin = ubuntu.UbuntuPlugin(
+            'dummy-plugin', Options(packages=['dummy-package']))
+        plugin.fix_symlinks(debdir=self.path)
+
+        self.assertEqual(os.readlink(link_name), self.expected_link)