Merge ~aluria/juju-verify:py36-test-support into ~canonical-solutions-engineering/juju-verify:master

[Alvaro Uria]

PY36 support on unit tests

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

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

[Martin Kalcok (martin-kalcok)]

Works fine for me. +1.

Just one addition. If we are going to support python 3.6 please update value in the setup.cfg.

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

Change successfully merged at revision 924ab079880eb4d4dbf30c3fd05d0248b55b82f2

diff --git a/setup.cfg b/setup.cfg
index 2a3220d..c8b93fb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,7 +18,7 @@ classifiers =
    Topic :: System :: Installation/Setup
    Topic :: Utilities
    Programming Language :: Python :: 3
-   Programming Language :: Python :: 3.8
+   Programming Language :: Python :: 3.6
 
 [options]
 include_package_data = True
diff --git a/tests/unit/test_juju_verify.py b/tests/unit/test_juju_verify.py
index e8ffad0..5e38d33 100644
--- a/tests/unit/test_juju_verify.py
+++ b/tests/unit/test_juju_verify.py
@@ -19,6 +19,7 @@
 import argparse
 import logging
 import sys
+from asyncio import Future
 from unittest.mock import ANY, MagicMock
 
 from juju import errors
@@ -55,7 +56,9 @@ async def test_connect_model(mocker, fail, model_name, func_name):
     either call 'juju.model.Model().connect_current` if model_name is None,
     or `juju.model.Model().connect_model(model_name)` if model_name is provided
     """
-    connection_method = mocker.patch.object(Model, func_name)
+    connection_method = mocker.patch.object(juju_verify.Model, func_name)
+    connection_method.return_value = Future()
+    connection_method.return_value.set_result(None)
 
     model = await juju_verify.connect_model(model_name)
 
@@ -159,6 +162,7 @@ def test_main_entrypoint(mocker):
 
     mocker.patch.object(juju_verify, 'parse_args').return_value = args
     mocker.patch.object(juju_verify, 'get_verifier').return_value = verifier
+    mocker.patch.object(juju_verify, 'loop')
     mocker.patch.object(juju_verify, 'connect_model')
     mocker.patch.object(juju_verify, 'find_units')
     logger = mocker.patch.object(juju_verify, 'logger')
@@ -180,6 +184,7 @@ def test_main_expected_failure(mocker, fail, error, error_msg):
     """Verify handling of expected exceptions."""
     mocker.patch.object(juju_verify, 'parse_args')
     mocker.patch.object(juju_verify, 'config_logger')
+    mocker.patch.object(juju_verify, 'loop')
     mocker.patch.object(juju_verify, 'connect_model')
     mocker.patch.object(juju_verify, 'find_units')
     mocker.patch.object(juju_verify,