Merge ~cjwatson/content-cache-charm:remove-functional-tests into content-cache-charm:master

[Colin Watson]

Remove functional tests

They didn't work properly for a couple of reasons:

 * Since commit bf9aa16221ed3fc2daf1a98343798c8d9e428aff, the `build` target that `make functional` depended on is no longer present, so you had to build the charm manually and unpack it into `builds/content-cache/` in a Juju repository somewhere, or else build it with `charmcraft pack` and hack the functional tests to point to the resulting `.charm` file.

 * The tests aren't quite compatible with the current version of `pytest-asyncio` for some reason.

Furthermore, the integration tests are completely a superset of the functional tests: they deal with building the charm to test themselves, they cover the same general ground of deploying the charm using Juju to see what happens, and they test more than the functional tests do. So it doesn't really make much sense to have both, especially considering that both functional and integration tests are quite slow.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Haw Loeung (hloeung)]

LGTM, thanks!

review: Approve (+1)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 789e443da21b90db33113c6dff8d9d13df4b7713

diff --git a/Makefile b/Makefile
index c7533cf..4446d25 100644
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,8 @@ help:
 	@echo ""
 	@echo " make help - show this text"
 	@echo " make lint - run flake8"
-	@echo " make test - run the functional test and unittests"
-	@echo " make unittest - run the the unittest"
-	@echo " make functional - run the functional tests"
+	@echo " make test - run the unit and integration tests"
+	@echo " make unittest - run the unit tests"
 	@echo " make integration - run the integration tests"
 	@echo " make clean - remove unneeded files"
 	@echo ""
@@ -18,14 +17,11 @@ lint: blacken
 	@echo "Running flake8"
 	@tox -e lint
 
-test: lint unittest functional
+test: lint unittest
 
 unittest:
 	@tox -e unit
 
-functional: build
-	@tox -e functional
-
 integration:
 	@tox -e integration
 
@@ -34,4 +30,4 @@ clean:
 	@git clean -ffXd
 
 # The targets below don't depend on a file
-.PHONY: lint test unittest functionaltest build clean help
+.PHONY: lint test unittest integration build clean help
diff --git a/tests/functional/requirements.txt b/tests/functional/requirements.txt
deleted file mode 100644
index f76bfbb..0000000
--- a/tests/functional/requirements.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-flake8
-juju
-mock
-pytest
-pytest-asyncio
-requests
diff --git a/tests/functional/test_content_cache.py b/tests/functional/test_content_cache.py
deleted file mode 100644
index 5d0ecf5..0000000
--- a/tests/functional/test_content_cache.py
+++ /dev/null
@@ -1,52 +0,0 @@
-import os
-import pytest
-from juju.model import Model
-
-# Treat tests as coroutines
-pytestmark = pytest.mark.asyncio
-
-series = ['bionic']
-juju_repository = os.getenv('JUJU_REPOSITORY', '.').rstrip('/')
-
-
[e-mail]
-async def model():
-    model = Model()
-    await model.connect_current()
-    yield model
-    await model.disconnect()
-
-
[e-mail]
-async def apps(model):
-    apps = []
-    for entry in series:
-        app = model.applications['content-cache-{}'.format(entry)]
-        apps.append(app)
-    return apps
-
-
[e-mail]
-async def units(apps):
-    units = []
-    for app in apps:
-        units.extend(app.units)
-    return units
-
-
[e-mail]('series', series)
-async def test_content_cache_deploy(model, series):
-    # Starts a deploy for each series
-    await model.deploy(
-        '{}/builds/content-cache'.format(juju_repository),
-        series=series,
-        application_name='content-cache-{}'.format(series),
-    )
-    assert True
-
-
-async def test_content_cache_status(apps, model):
-    # Verifies status for all deployed series of the charm
-    for app in apps:
-        await model.block_until(lambda: app.status == 'active')
-    assert True
diff --git a/tox.ini b/tox.ini
index cfe4513..e339c8d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 skipsdist=True
-envlist = unit, functional
+envlist = unit
 skip_missing_interpreters = True
 
 [testenv]
@@ -10,7 +10,7 @@ setenv =
 
 [testenv:unit]
 commands = 
-    pytest --ignore {toxinidir}/tests/functional \
+    pytest \
       --ignore {toxinidir}/tests/integration \
       {posargs:-v  --cov=lib --cov=reactive --cov=actions --cov-branch --cov-report=term-missing --cov-report=html}
 deps = -r{toxinidir}/tests/unit/requirements.txt
@@ -19,19 +19,9 @@ setenv =
   PYTHONPATH={toxinidir}/lib
   TZ=UTC
 
-[testenv:functional]
-passenv =
-  HOME
-  JUJU_REPOSITORY
-  PATH
-commands =
-	pytest -v --ignore {toxinidir}/tests/unit --ignore {toxinidir}/tests/integration {posargs}
-deps = -r{toxinidir}/tests/functional/requirements.txt
-       -r{toxinidir}/requirements.txt
-
 [testenv:integration]
 commands = pytest -v --ignore {toxinidir}/tests/unit \
-           --ignore {toxinidir}/tests/functional --log-cli-level=INFO {posargs}
+           --log-cli-level=INFO {posargs}
 deps = pytest
        pytest-operator
        pytest-asyncio