Merge lp:~hloeung/ubuntu-repository-cache/pytest-coverage-fix-unit-tests into lp:ubuntu-repository-cache

[Haw Loeung]

Switch to pytest and fix unit tests

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

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

[Paul Collins (pjdc)]

review: Approve (lgtm)

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

Change successfully merged at revision 282

=== modified file 'Makefile'
--- Makefile	2020-05-07 05:31:42 +0000
+++ Makefile	2020-08-11 04:14:46 +0000
@@ -28,10 +28,14 @@
 	sudo apt-get update
 	sudo apt-get install -y python3-amulet
 
-test:
-	@tox
+test: lint unittest
+
+unittest:
+	@tox -e unit
 
 lint:
+	@echo "Normalising python layout with black."
+	@tox -e black
 	@echo Checking for Python syntax...
 	@tox -e lint
 
 
=== modified file 'lib/ubuntu_repository_cache/tests/test_metadata_sync.py'
--- lib/ubuntu_repository_cache/tests/test_metadata_sync.py	2017-04-04 12:12:06 +0000
+++ lib/ubuntu_repository_cache/tests/test_metadata_sync.py	2020-08-11 04:14:46 +0000
@@ -181,6 +181,7 @@
         expected = [
             [(['juju-run',
                'unit/0',
+               '/usr/local/sbin/charm-env '
                '/var/lib/juju/agents/something/charm/hooks/'
                'ubuntu-repository-cache-sync some_meta_var'],), {}]]
 
 
=== modified file 'lib/ubuntu_repository_cache/tests/test_squid.py'
--- lib/ubuntu_repository_cache/tests/test_squid.py	2019-07-17 04:24:08 +0000
+++ lib/ubuntu_repository_cache/tests/test_squid.py	2020-08-11 04:14:46 +0000
@@ -1,6 +1,11 @@
+import os
+import shutil
+import tempfile
 import unittest
 from unittest import mock
 
+from charmhelpers.core import unitdata
+
 from .. import squid
 
 
@@ -11,6 +16,12 @@
         self.mock_config = patcher.start()
         self.addCleanup(patcher.stop)
 
+        self.tmpdir = tempfile.mkdtemp(prefix='charm-unittests-')
+        self.addCleanup(shutil.rmtree, self.tmpdir)
+        os.environ['UNIT_STATE_DB'] = os.path.join(self.tmpdir, '.unit-state.db')
+        unitdata.kv().set('squid-cache-disk', 5000)
+        unitdata.kv().set('squid-disk-caches', [('/srv', 2000)])
+
     def test_squid_cache_size(self):
         self.mock_config.return_value = {
             'squid-cache-disk': 20 * 1024,
 
=== modified file 'lib/ubuntu_repository_cache/tests/test_util.py'
--- lib/ubuntu_repository_cache/tests/test_util.py	2017-03-29 07:24:11 +0000
+++ lib/ubuntu_repository_cache/tests/test_util.py	2020-08-11 04:14:46 +0000
@@ -46,9 +46,3 @@
         thefile = os.path.join(self.test_dir, "whatever")
         util.touch(thefile)
         self.assertTrue(os.path.exists(thefile))
-
-    def test_touch_fails_on_file_exists(self):
-        thefile = os.path.join(self.test_dir, "whatever")
-        with open(thefile, "w") as fd:
-            fd.write("something")
-        self.assertRaises(IOError, util.touch(thefile))
 
=== added file 'pytest.ini'
--- pytest.ini	1970-01-01 00:00:00 +0000
+++ pytest.ini	2020-08-11 04:14:46 +0000
@@ -0,0 +1,13 @@
+[pytest]
+filterwarnings =
+    # https://github.com/juju/charm-helpers/issues/294
+    ignore:.*inspect.getargspec\(\) is deprecated.*:DeprecationWarning
+    # https://github.com/juju/charm-helpers/issues/293
+    ignore:.*dist\(\) and linux_distribution\(\) functions are deprecated:PendingDeprecationWarning
+    ignore:.*dist\(\) and linux_distribution\(\) functions are deprecated:DeprecationWarning
+
+    # distutils
+    ignore:the imp module is deprecated in favour of importlib:DeprecationWarning
+
+    # backoff
+    ignore:.*Task.current_task\(\) is deprecated, use asyncio.current_task\(\) instead:DeprecationWarning
 
=== added file 'requirements.txt'
=== added file 'tests/unit/requirements.txt'
--- tests/unit/requirements.txt	1970-01-01 00:00:00 +0000
+++ tests/unit/requirements.txt	2020-08-11 04:14:46 +0000
@@ -0,0 +1,8 @@
+backoff==1.4.0
+charmhelpers
+charms.reactive
+freezegun
+mock
+nose
+pytest
+pytest-cov
 
=== modified file 'tox.ini'
--- tox.ini	2020-05-07 05:29:31 +0000
+++ tox.ini	2020-08-11 04:14:46 +0000
@@ -3,18 +3,23 @@
 skipsdist = True
 
 [testenv]
-setenv =
-    PYTHONPATH = {toxinidir}
-deps =
-    pyyaml
-    nose
-    flake8
-    mock
-    ipdb
-    coverage
-    backoff==1.4.0
-commands=
-    nosetests -v --with-coverage -s lib/ubuntu_repository_cache --ignore-files=vendor/*
+basepython = python3
+setenv =
+  PYTHONPATH = .
+
+[testenv:unit]
+commands =
+    pytest --ignore {toxinidir}/tests/functional \
+      {posargs:-v  --cov=lib --cov=reactive --cov=actions --cov-report=term-missing --cov-branch}
+deps = -r{toxinidir}/tests/unit/requirements.txt
+       -r{toxinidir}/requirements.txt
+setenv =
+  PYTHONPATH={toxinidir}/lib
+  TZ=UTC
+
+[testenv:black]
+commands = black --skip-string-normalization --line-length=120 .
+deps = black
 
 [testenv:lint]
 deps=