Merge ~peter-sabaini/charm-sudo-pair:fix-functest into ~sudo-pair-charmers/charm-sudo-pair:master

[Peter Sabaini]

[Joel Sing (jsing)]

LGTM from a readability/standards perspective, with some minor comments.

Please get a review from a domain expert/peer for the functionality change.

review: Approve (+1)

[Peter Sabaini (peter-sabaini)]

Thanks for the review, added changes

@Guiseppe, can I ask for a review from you as well please?

diff --git a/.gitignore b/.gitignore
index 70c6568..a437a87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@ __pycache__
 builds/
 .idea
 .tox
-
+/repo-info
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..460970a
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,50 @@
+PROJECTPATH = $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+ifndef JUJU_REPOSITORY
+	JUJU_REPOSITORY := $(shell pwd)
+	$(warning Warning JUJU_REPOSITORY was not set, defaulting to $(JUJU_REPOSITORY))
+endif
+
+help:
+	@echo "This project supports the following targets"
+	@echo ""
+	@echo " make help - show this text"
+	@echo " make lint - run flake8"
+	@echo " make test - run the unittests and lint"
+	@echo " make unittest - run the tests defined in the unit subdirectory"
+	@echo " make functional - run the tests defined in the functional subdirectory"
+	@echo " make release - build the charm"
+	@echo " make clean - remove unneeded files"
+	@echo ""
+
+submodules:
+	@echo "Cloning submodules"
+	@git submodule update --init --recursive
+
+lint:
+	@echo "Running flake8"
+	@tox -e lint
+
+test: unittest functional lint
+
+unittest:
+	@tox -e unit
+
+functional: build
+	@tox -e functional
+
+build:
+	@echo "Building charm to base directory $(JUJU_REPOSITORY)"
+	@-git describe --tags > $(PROJECTPATH)/repo-info
+	@LAYER_PATH=./layers INTERFACE_PATH=./interfaces\
+		JUJU_REPOSITORY=$(JUJU_REPOSITORY) charm build ./ --force
+
+release: clean build
+	@echo "Charm is built at $(JUJU_REPOSITORY)/builds"
+
+clean:
+	@echo "Cleaning files"
+	@rm -rf $(PROJECTPATH)/.tox
+	@rm -rf $(PROJECTPATH)/.pytest_cache
+
+# The targets below don't depend on a file
+.PHONY: lint test unittest functional build release clean help submodules
diff --git a/tests/functional/requirements.txt b/tests/functional/requirements.txt
index b9815c2..6c6cdc6 100644
--- a/tests/functional/requirements.txt
+++ b/tests/functional/requirements.txt
@@ -1,6 +1,6 @@
 juju
 requests
-pytest
+pytest==4.0.2
 pytest-asyncio
 mock
 flake8
diff --git a/tests/functional/test_deploy.py b/tests/functional/test_deploy.py
index 6ce4ec3..9b27ba2 100644
--- a/tests/functional/test_deploy.py
+++ b/tests/functional/test_deploy.py
@@ -1,5 +1,6 @@
 #!/usr/bin/python3.6
 
+import os
 import pytest
 
 pytestmark = pytest.mark.asyncio
@@ -25,7 +26,7 @@ async def deploy_app(request, model):
         channel='stable'
     )
     sudo_pair_app = await model.deploy(
-        'local:',
+        '{}/builds/sudo-pair'.format(os.getenv('JUJU_REPOSITORY')),
         application_name='sudo-pair-' + release,
         series=release,
         num_units=0,
diff --git a/tox.ini b/tox.ini
index 3750c4a..123e618 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,6 +5,8 @@ skip_missing_interpreters = True
 
 [testenv]
 basepython = python3.6
+setenv =
+  PYTHONPATH = .
 
 [testenv:unit]
 commands = pytest -v --ignore {toxinidir}/tests/amulet --ignore {toxinidir}/tests/functional
@@ -12,6 +14,19 @@ deps = -r{toxinidir}/tests/unit/requirements.txt
 setenv = PYTHONPATH={toxinidir}/lib
 
 [testenv:functional]
-passenv = HOME
+passenv =
+  HOME
+  JUJU_REPOSITORY
+  PATH
 commands = pytest -v --ignore {toxinidir}/tests/unit --ignore {toxinidir}/tests/amulet
 deps = -r{toxinidir}/tests/functional/requirements.txt
+
+[testenv:lint]
+commands = flake8
+deps = flake8
+
+[flake8]
+exclude =
+    .git,
+    __pycache__,
+    .tox,