Merge branch 'master' into feature/ssh

Author: ChrisMacNaughton

juju/model.py

@@ -2192,6 +2192,12 @@ def make_archive(self, path):
             relative_path = dirpath[len(self.path) + 1:]
             if relative_path and not self._ignore(relative_path):
                 zf.write(dirpath, relative_path)
+            for dirname in dirnames:
+                archive_name = os.path.join(relative_path, dirname)
+                real_path = os.path.join(dirpath, dirname)
+                if os.path.islink(real_path):
+                    self._check_link(real_path)
+                    self._write_symlink(zf, os.readlink(real_path), archive_name)
             for name in filenames:
                 archive_name = os.path.join(relative_path, name)
                 if not self._ignore(archive_name):

tests/charm-folder-symlink/hooks/install

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -eux
+./lib/module/hello.sh
+status-set active

tests/charm-folder-symlink/lib/module

@@ -0,0 +1 @@
+../mod/module

tests/charm-folder-symlink/metadata.yaml

@@ -0,0 +1,7 @@
+name: simple
+summary: A simple example charm with the new operator framework
+description: |
+    Simple is an example charm
+series:
+- xenial
+- bionic

tests/charm-folder-symlink/mod/module/hello.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "Hello World"

tests/integration/test_model.py

@@ -93,6 +93,25 @@ async def test_deploy_bundle(event_loop):
             assert app in model.applications
 
 
+@base.bootstrapped
+@pytest.mark.asyncio
+async def test_deploy_local_charm_folder_symlink(event_loop):
+    from pathlib import Path
+    tests_dir = Path(__file__).absolute().parent.parent
+    charm_path = tests_dir / 'charm-folder-symlink'
+
+    async with base.CleanModel() as model:
+        simple = await model.deploy(str(charm_path))
+        assert 'simple' in model.applications
+        terminal_statuses = ('active', 'error', 'blocked')
+        await model.block_until(
+            lambda: (
+                len(simple.units) > 0 and
+                simple.units[0].workload_status in terminal_statuses)
+        )
+        assert simple.units[0].workload_status == 'active'
+
+
 @base.bootstrapped
 @pytest.mark.asyncio
 async def test_deploy_trusted_bundle(event_loop):

tox.ini

@@ -42,7 +42,7 @@ commands =
 [testenv:lint]
 envdir = {toxworkdir}/py3
 commands =
-    flake8 --ignore E501,W504 {posargs} juju tests examples
+    flake8 --ignore E501,W504,E402 {posargs} juju tests examples
 deps =
     flake8