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

[Leo Arias]

Fixed the symlinks tests to check dir links.

Requires https://code.launchpad.net/~longsleep/snapcraft/snapcraft-dirs-symlink/+merge/267176 to pass.

[lp:~elopio/snapcraft/symlinks-2]

134. By Leo Arias on 2015-08-06

Cleaned the test.

[Leo Arias (elopio)]

From sergion on the prerequisite:

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

review: Disapprove

Unmerged revisions

134. By Leo Arias on 2015-08-06

Cleaned the test.

133. By Leo Arias on 2015-08-06

Fixed the symlinks tests to check dir links.

132. By Leo Arias on 2015-08-06

Merged with parent.

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.

=== modified file 'snapcraft/tests/test_ubuntu_plugin.py'
--- snapcraft/tests/test_ubuntu_plugin.py	2015-08-06 18:26:49 +0000
+++ snapcraft/tests/test_ubuntu_plugin.py	2015-08-06 18:26:49 +0000
@@ -73,10 +73,12 @@
             'type_': 'dir',
             'expected_link': 'test_source_dir'}),
         ('absolute_dir_path', {
-            'source_name': 'test_source_dir',
+            # The name of the absolute dir must match the name of an existing
+            # directory, otherwise the link will be a file, not a dir.
+            'source_name': 'tmp',
             'abs_source': True,
             'type_': 'dir',
-            'expected_link': 'test_source_dir'}),
+            'expected_link': 'tmp'}),
         ('absolute_unexisting_path', {
             'source_name': 'unexisting_test_source',
             'abs_source': True,