Merge ~peppepetra/charm-juju-controller:blacken-20.08 into charm-juju-controller:master

[Giuseppe Petralia]

Blackened repository to 88 lines

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

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

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

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[Alvaro Uria (aluria)]

+1 I tested this together with the other 2 MPs (blacken and linting) and all tests passed.

review: Approve

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

Change successfully merged at revision bdbd4d486c92fae360b4ce2b9e7c96ff78715323

diff --git a/src/files/plugins/check_jujucontroller.py b/src/files/plugins/check_jujucontroller.py
index 8f919e7..0dc0946 100755
--- a/src/files/plugins/check_jujucontroller.py
+++ b/src/files/plugins/check_jujucontroller.py
@@ -21,20 +21,20 @@ import yaml
 # trivial, as that file's path depends on the application name. This could be
 # solved by making this whole script a jinja template rendered at charm
 # installation, but this in turn would make unit testing more complex.
-CACERTPATH = '/run/juju-controller-ca.crt'
+CACERTPATH = "/run/juju-controller-ca.crt"
 # This file will only contain non-secret values extracted from the controller
 # agent.conf.
 # At the moment these are only the juju version and the API port.
-PUBAGENTCONFPATH = '/run/juju-controller-public-agent.conf'
+PUBAGENTCONFPATH = "/run/juju-controller-public-agent.conf"
 
 
 # see:
 # - https://github.com/juju/juju/pull/11096
 # - https://bugs.launchpad.net/juju/+bug/1797848
-MINVER = '2.7.2'
+MINVER = "2.7.2"
 # Known response bodies that may be returned by the health endpoint
-OKSTATUSES = ['running']
-WARNSTATUSES = ['starting', 'stopping']
+OKSTATUSES = ["running"]
+WARNSTATUSES = ["starting", "stopping"]
 
 
 class States(Enum):
@@ -51,7 +51,7 @@ def _supported(version):
 
 
 def _get_agent_conf(path=PUBAGENTCONFPATH):
-    with open(path, 'r') as agentconffile:
+    with open(path, "r") as agentconffile:
         return yaml.safe_load(agentconffile)
 
 
@@ -60,36 +60,26 @@ def check_endpoint(agentconf=PUBAGENTCONFPATH):
     try:
         agentconf = _get_agent_conf(agentconf)
     except FileNotFoundError:
-        msg = (
-            '{} not found. Cannot query the endpoint'
-            ''.format(PUBAGENTCONFPATH)
-        )
+        msg = "{} not found. Cannot query the endpoint".format(PUBAGENTCONFPATH)
         return States.UNKNOWN, msg
 
-    endpoint = (
-        'https://localhost:{}/health'
-        ''.format(agentconf.get('apiport'))
-    )
+    endpoint = "https://localhost:{}/health".format(agentconf.get("apiport"))
 
-    controller_version = agentconf.get('upgradedToVersion')
+    controller_version = agentconf.get("upgradedToVersion")
     if not _supported(controller_version):
-        msg = (
-            'juju version {} does not offer a monitoring endpoint'
-            ''.format(controller_version)
+        msg = "juju version {} does not offer a monitoring endpoint".format(
+            controller_version
         )
         return States.UNKNOWN, msg
 
     try:
         r = requests.get(endpoint, verify=CACERTPATH, timeout=15)
     except (RequestException, OSError) as error:
-        msg = 'cannot connect to the health endpoint. Error: {}'.format(error)
+        msg = "cannot connect to the health endpoint. Error: {}".format(error)
         return States.CRITICAL, msg
 
     if not r.ok:
-        msg = (
-            'the health endpoint returned status code {}'
-            ''.format(r.status_code)
-        )
+        msg = "the health endpoint returned status code {}".format(r.status_code)
         return States.UNKNOWN, msg
 
     controller_status = r.text.strip()
@@ -107,10 +97,10 @@ def check_endpoint(agentconf=PUBAGENTCONFPATH):
 def main():
     """Print the status of the controller and return the proper RC."""
     state, msg = check_endpoint()
-    formatted_output = '{}: {}'.format(state.name, msg)
+    formatted_output = "{}: {}".format(state.name, msg)
     print(formatted_output)
     sys.exit(state.value)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
diff --git a/src/lib/lib_juju_controller.py b/src/lib/lib_juju_controller.py
index df9ecea..2b45272 100644
--- a/src/lib/lib_juju_controller.py
+++ b/src/lib/lib_juju_controller.py
@@ -7,12 +7,12 @@ import shutil
 from charmhelpers.core import hookenv
 import yaml
 
-AGENTDIRGLOB = '/var/lib/juju/agents/machine-*'
-CACERTPATH = '/run/juju-controller-ca.crt'
-PUBAGENTCONFPATH = '/run/juju-controller-public-agent.conf'
+AGENTDIRGLOB = "/var/lib/juju/agents/machine-*"
+CACERTPATH = "/run/juju-controller-ca.crt"
+PUBAGENTCONFPATH = "/run/juju-controller-public-agent.conf"
 
 
-class JujuControllerHelper():
+class JujuControllerHelper:
     """A small helper lib for the juju controller charm."""
 
     def __init__(self):
@@ -20,65 +20,64 @@ class JujuControllerHelper():
         self.charm_config = hookenv.config()
 
     def _machine_id(self):
-        machine = os.path.basename(
-            glob.glob(AGENTDIRGLOB)[0]
-        )
-        return machine.split('-').pop()
+        machine = os.path.basename(glob.glob(AGENTDIRGLOB)[0])
+        return machine.split("-").pop()
 
     def dump_ca(self, path=CACERTPATH):
-        """Extract the CA cert from agent.conf and place it in a nagios-readable file."""
-        with open(path, 'w') as cafile:
+        """Extract CA cert from agent.conf and place it in a nagios-readable file."""
+        with open(path, "w") as cafile:
             cafile.write(self.cacert)
         try:
-            shutil.chown(path, user='nagios')
+            shutil.chown(path, user="nagios")
         except LookupError as error:
-            msg = 'cannot chown {} to user nagios. {}'.format(path, error)
+            msg = "cannot chown {} to user nagios. {}".format(path, error)
             hookenv.log(msg, level=hookenv.WARNING)
 
     def dump_public_agent_conf(self, path=PUBAGENTCONFPATH):
-        """Save version and API port from agent.conf and place them in a nagios-readable file."""
-        with open(path, 'w') as pubagentconffile:
+        """Provide version and api port to nagios.
+
+        Get version and API port from agent.conf
+        and place them in a nagios-readable file.
+        """
+        with open(path, "w") as pubagentconffile:
             public_data = {
-                'upgradedToVersion': self.version,
-                'apiport': self.apiport,
-             }
+                "upgradedToVersion": self.version,
+                "apiport": self.apiport,
+            }
             yaml.dump(public_data, pubagentconffile)
         try:
-            shutil.chown(path, user='nagios')
+            shutil.chown(path, user="nagios")
         except LookupError as error:
-            msg = 'cannot chown {} to user nagios. {}'.format(path, error)
+            msg = "cannot chown {} to user nagios. {}".format(path, error)
             hookenv.log(msg, level=hookenv.WARNING)
 
     @property
     def services(self):
         """Return the list of juju services on this machine."""
-        return ['juju-db', 'jujud-machine-{}'.format(self._machine_id())]
+        return ["juju-db", "jujud-machine-{}".format(self._machine_id())]
 
     @property
     def agent_conf_path(self):
         """Return the path of the controller agent.conf file."""
-        return os.path.join(
-            glob.glob(AGENTDIRGLOB)[0],
-            'agent.conf'
-        )
+        return os.path.join(glob.glob(AGENTDIRGLOB)[0], "agent.conf")
 
     @property
     def agent_conf(self):
         """Return the content of the controller agent.conf file as a map."""
-        with open(self.agent_conf_path, 'r') as agentconffile:
+        with open(self.agent_conf_path, "r") as agentconffile:
             return yaml.safe_load(agentconffile)
 
     @property
     def version(self):
         """Return the version of the juju controller."""
-        return self.agent_conf.get('upgradedToVersion')
+        return self.agent_conf.get("upgradedToVersion")
 
     @property
     def apiport(self):
         """Return the tcp port the API is listening at."""
-        return self.agent_conf.get('apiport')
+        return self.agent_conf.get("apiport")
 
     @property
     def cacert(self):
         """Return the CA certificate needed to verify the juju controller cert."""
-        return self.agent_conf.get('cacert')
+        return self.agent_conf.get("cacert")
diff --git a/src/reactive/juju_controller.py b/src/reactive/juju_controller.py
index 96005df..5905b53 100644
--- a/src/reactive/juju_controller.py
+++ b/src/reactive/juju_controller.py
@@ -19,10 +19,10 @@ from lib_juju_controller import JujuControllerHelper
 
 helper = JujuControllerHelper()
 
-PLUGINS_DIR = '/usr/local/lib/nagios/plugins/'
+PLUGINS_DIR = "/usr/local/lib/nagios/plugins/"
 
 
-@when_not('juju-controller.installed')
+@when_not("juju-controller.installed")
 def install_juju_controller():
     """Install the juju controller charm. This is a no-op for now."""
     # Do your setup here.
@@ -36,12 +36,12 @@ def install_juju_controller():
     #  * https://jujucharms.com/docs/devel/developer-getting-started
     #  * https://github.com/juju-solutions/layer-basic#overview
     #
-    set_flag('juju-controller.installed')
-    hookenv.status_set('active', 'Ready')
+    set_flag("juju-controller.installed")
+    hookenv.status_set("active", "Ready")
 
 
-@when('nrpe-external-master.available')
-@when('nrpe-plugins.installed')
+@when("nrpe-external-master.available")
+@when("nrpe-plugins.installed")
 def update_nrpe_config():
     """Configure nrpe checks."""
     hostname = nrpe.get_nagios_hostname()
@@ -53,35 +53,35 @@ def update_nrpe_config():
 
     # Health endpoint
     nrpe_setup.add_check(
-        shortname='juju_health',
-        description='Juju health check for the built-in health endpoint',
-        check_cmd=os.path.join(PLUGINS_DIR, 'check_jujucontroller.py')
+        shortname="juju_health",
+        description="Juju health check for the built-in health endpoint",
+        check_cmd=os.path.join(PLUGINS_DIR, "check_jujucontroller.py"),
     )
     # cache agent.conf data (required by the endpoint check)
     cache_agent_conf()
 
     nrpe_setup.write()
-    hookenv.status_set('active', 'NRPE configured')
+    hookenv.status_set("active", "NRPE configured")
 
 
-@when_not('nrpe-plugins.installed')
+@when_not("nrpe-plugins.installed")
 def update_plugins():
     """Copy nrpe plugins to the system path."""
-    src_dir = os.path.join(hookenv.charm_dir(), 'files', 'plugins/')
+    src_dir = os.path.join(hookenv.charm_dir(), "files", "plugins/")
     nrpe.copy_nrpe_checks(src_dir)
-    set_flag('nrpe-plugins.installed')
+    set_flag("nrpe-plugins.installed")
 
 
 @when_file_changed(helper.agent_conf_path)
-@when('nrpe-external-master.available')
+@when("nrpe-external-master.available")
 def cache_agent_conf():
     """Cache parts of agent.conf in a file the nagios user can read."""
     helper.dump_ca()
     helper.dump_public_agent_conf()
 
 
-@hook('upgrade-charm')
+@hook("upgrade-charm")
 def upgrade_charm():
     """Unset all custom flags to prepare for charm upgrade."""
-    clear_flag('nrpe-plugins.installed')
-    clear_flag('juju-controller.installed')
+    clear_flag("nrpe-plugins.installed")
+    clear_flag("juju-controller.installed")
diff --git a/src/tests/functional/tests/tests_juju_controller.py b/src/tests/functional/tests/tests_juju_controller.py
index bdefa2b..3fd5229 100644
--- a/src/tests/functional/tests/tests_juju_controller.py
+++ b/src/tests/functional/tests/tests_juju_controller.py
@@ -27,9 +27,7 @@ async def juju_status(unit, inner_model, filter=""):
     return data
 
 
-async def check_for_inner_status(
-    unit, inner_model, inner_app, target="active"
-):
+async def check_for_inner_status(unit, inner_model, inner_app, target="active"):
     """Check if status of an app is equal to target."""
     status = await juju_status(unit, inner_model)
     apps = status.get("applications", {})
@@ -74,31 +72,22 @@ class JujuControllerTestBase(unittest.TestCase):
         out = model.run_on_unit(
             cls.unit, "sudo -u ubuntu -H /snap/bin/juju enable-ha -n 3"
         )
-        assert out["Code"] == "0", "Error enabling ha: {}".format(
-            out["Stderr"]
-        )
+        assert out["Code"] == "0", "Error enabling ha: {}".format(out["Stderr"])
 
     @classmethod
     def run_remote_juju(cls, cmd, opts):
         """Run juju command on controller model."""
-        cmd = "sudo -u ubuntu -H /snap/bin/juju {} -m controller {}".format(
-            cmd, opts
-        )
+        cmd = "sudo -u ubuntu -H /snap/bin/juju {} -m controller {}".format(cmd, opts)
         out = model.run_on_unit(cls.unit, cmd)
-        assert out["Code"] == "0", "Error running {}: {}".format(
-            cmd, out["Stderr"]
-        )
+        assert out["Code"] == "0", "Error running {}: {}".format(cmd, out["Stderr"])
         return out["Stdout"]
 
     @classmethod
     def deploy_juju_controller(cls):
         """Deploy juju-controller charm."""
-        model.scp_to_unit(
-            cls.unit, str(BUILT_CHARM), "/home/ubuntu", scp_opts="-r"
-        )
+        model.scp_to_unit(cls.unit, str(BUILT_CHARM), "/home/ubuntu", scp_opts="-r")
         cls.run_remote_juju(
-            "deploy",
-            "-n 3 --to 0,1,2 /home/ubuntu/juju-controller juju-controller",
+            "deploy", "-n 3 --to 0,1,2 /home/ubuntu/juju-controller juju-controller",
         )
         block_until_inner_app(cls.unit, "controller", "juju-controller")
 
diff --git a/src/tests/unit/conftest.py b/src/tests/unit/conftest.py
index 34aebc2..b67d094 100644
--- a/src/tests/unit/conftest.py
+++ b/src/tests/unit/conftest.py
@@ -15,19 +15,20 @@ import yaml
 def mock_layers(monkeypatch):
     """Mock layers."""
     import sys
-    sys.modules['charms.layer'] = mock.Mock()
-    sys.modules['reactive'] = mock.Mock()
+
+    sys.modules["charms.layer"] = mock.Mock()
+    sys.modules["reactive"] = mock.Mock()
     # Mock any functions in layers that need to be mocked here
 
     def options(layer):
         # mock options for layers here
-        if layer == 'example-layer':
-            options = {'port': 9999}
+        if layer == "example-layer":
+            options = {"port": 9999}
             return options
         else:
             return None
 
-    monkeypatch.setattr('lib_juju_controller.layer.options', options)
+    monkeypatch.setattr("lib_juju_controller.layer.options", options)
 
 
 @pytest.fixture
@@ -37,29 +38,25 @@ def mock_hookenv_config(monkeypatch):
 
     def mock_config():
         cfg = {}
-        charm_config_path = os.path.join(
-            os.path.dirname(__file__),
-            '../../config.yaml'
-        )
+        charm_config_path = os.path.join(os.path.dirname(__file__), "../../config.yaml")
         yml = yaml.safe_load(open(charm_config_path))
 
         # Load all defaults
-        for key, value in yml['options'].items():
-            cfg[key] = value['default']
+        for key, value in yml["options"].items():
+            cfg[key] = value["default"]
 
         # Manually add cfg from other layers
         # cfg['my-other-layer'] = 'mock'
         return cfg
 
-    monkeypatch.setattr('lib_juju_controller.hookenv.config', mock_config)
+    monkeypatch.setattr("lib_juju_controller.hookenv.config", mock_config)
 
 
 @pytest.fixture
 def mock_remote_unit(monkeypatch):
     """Mock hookenv.remote_unit."""
     monkeypatch.setattr(
-        'lib_juju_controller.hookenv.remote_unit',
-        lambda: 'unit-mock/0'
+        "lib_juju_controller.hookenv.remote_unit", lambda: "unit-mock/0"
     )
 
 
@@ -67,8 +64,7 @@ def mock_remote_unit(monkeypatch):
 def mock_charm_dir(monkeypatch):
     """Provide a mocked hookenv.charm_dir."""
     monkeypatch.setattr(
-        'lib_juju_controller.hookenv.charm_dir',
-        lambda: '/mock/charm/dir'
+        "lib_juju_controller.hookenv.charm_dir", lambda: "/mock/charm/dir"
     )
 
 
@@ -83,47 +79,38 @@ def mock_unit_db(monkeypatch):
 @pytest.fixture
 def agent_conf_sample_path():
     """Provide a sample agent.conf (path only)."""
-    return os.path.join(
-        os.path.dirname(__file__),
-        '../samples/agent.conf'
-    )
+    return os.path.join(os.path.dirname(__file__), "../samples/agent.conf")
 
 
 @pytest.fixture
 def agent_conf_sample(agent_conf_sample_path):
     """Provide a map representing the content of the sample agent.conf."""
-    with open(agent_conf_sample_path, 'r') as agentconffile:
+    with open(agent_conf_sample_path, "r") as agentconffile:
         return yaml.safe_load(agentconffile)
 
 
 @pytest.fixture
 def jujucontroller(
-    mock_hookenv_config,
-    monkeypatch,
-    agent_conf_sample,
+    mock_hookenv_config, monkeypatch, agent_conf_sample,
 ):
     """Mock the JujuControllerHelper.
 
     Properties are initialized based on the contents of the agent.conf sample
     """
     from lib_juju_controller import JujuControllerHelper
+
     helper = JujuControllerHelper()
 
     monkeypatch.setattr(
-        'lib_juju_controller.glob.glob',
-        lambda _: ['/var/lib/juju/agents/machine-99']
+        "lib_juju_controller.glob.glob", lambda _: ["/var/lib/juju/agents/machine-99"]
     )
 
     monkeypatch.setattr(
-        'lib_juju_controller.JujuControllerHelper.agent_conf',
-        agent_conf_sample
+        "lib_juju_controller.JujuControllerHelper.agent_conf", agent_conf_sample
     )
 
     # Any other functions that load helper will get this version
-    monkeypatch.setattr(
-        'lib_juju_controller.JujuControllerHelper',
-        lambda: helper
-    )
+    monkeypatch.setattr("lib_juju_controller.JujuControllerHelper", lambda: helper)
 
     return helper
 
diff --git a/src/tests/unit/test_check_jujucontroller.py b/src/tests/unit/test_check_jujucontroller.py
index ffba1ef..e6cad4a 100644
--- a/src/tests/unit/test_check_jujucontroller.py
+++ b/src/tests/unit/test_check_jujucontroller.py
@@ -6,50 +6,43 @@ import sys
 import pytest
 import responses
 
-PLUGINS_DIR = os.path.join(
-    os.path.dirname(__file__),
-    '../../files/plugins'
-)
+PLUGINS_DIR = os.path.join(os.path.dirname(__file__), "../../files/plugins")
 sys.path.append(PLUGINS_DIR)
 import check_jujucontroller as nrpecheck  # noqa: E402,I100,I202
 
 
-class TestCheckJujuController():
+class TestCheckJujuController:
     """Class containing all tests for the controller NRPE check."""
 
-    @pytest.mark.parametrize(
-        "version,expected",
-        [('2.8.1', True), ('2.5.6', False)]
-    )
+    @pytest.mark.parametrize("version,expected", [("2.8.1", True), ("2.5.6", False)])
     def test_supported_function(self, version, expected):
         """Ensure the version check cuts off at 2.7.2."""
         assert nrpecheck._supported(version) is expected
 
     def test_no_pubagentconf(self, monkeypatch):
         """Return UNKNOWN if the required auxiliary files are not in place."""
-        state, _ = nrpecheck.check_endpoint('/this/file/does/not/exist')
+        state, _ = nrpecheck.check_endpoint("/this/file/does/not/exist")
         assert state == nrpecheck.States.UNKNOWN
 
     def test_unsupported(self, monkeypatch, agent_conf_sample_path):
         """Checking an unsupported version should return UNKNOWN."""
-        monkeypatch.setattr(
-            'check_jujucontroller._supported',
-            lambda _: False
-        )
+        monkeypatch.setattr("check_jujucontroller._supported", lambda _: False)
         state, _ = nrpecheck.check_endpoint(agent_conf_sample_path)
         assert state == nrpecheck.States.UNKNOWN
 
     def test_connection_error(self, monkeypatch, agent_conf_sample_path):
         """Connection exceptions should be reported as CRITICAL."""
         monkeypatch.setattr(
-            'check_jujucontroller.requests.get',
-            lambda *args, **kwargs: exec('raise ConnectionError("foo")')
+            "check_jujucontroller.requests.get",
+            lambda *args, **kwargs: exec('raise ConnectionError("foo")'),
         )
         state, msg = nrpecheck.check_endpoint(agent_conf_sample_path)
         assert state == nrpecheck.States.CRITICAL
-        assert msg == 'cannot connect to the health endpoint. Error: foo'
+        assert msg == "cannot connect to the health endpoint. Error: foo"
 
-    def test_status_codes(self, jujucontroller, mocked_responses, agent_conf_sample_path):
+    def test_status_codes(
+        self, jujucontroller, mocked_responses, agent_conf_sample_path
+    ):
         """The endpoint should always return 200, regardless of controller state.
 
         Any other HTTP status should be considered an UNKNOWN state.
@@ -57,8 +50,8 @@ class TestCheckJujuController():
         """
         mocked_responses.add(
             responses.GET,
-            'https://localhost:{}/health'.format(jujucontroller.apiport),
-            body='foo',
+            "https://localhost:{}/health".format(jujucontroller.apiport),
+            body="foo",
             status=404,
         )
         state, _ = nrpecheck.check_endpoint(agent_conf_sample_path)
@@ -66,9 +59,9 @@ class TestCheckJujuController():
 
     @pytest.mark.parametrize(
         "response,expected_state",
-        [(res, nrpecheck.States.OK) for res in nrpecheck.OKSTATUSES] +
-        [(res, nrpecheck.States.WARNING) for res in nrpecheck.WARNSTATUSES] +
-        [('fubar', nrpecheck.States.CRITICAL)]
+        [(res, nrpecheck.States.OK) for res in nrpecheck.OKSTATUSES]
+        + [(res, nrpecheck.States.WARNING) for res in nrpecheck.WARNSTATUSES]
+        + [("fubar", nrpecheck.States.CRITICAL)],
     )
     def test_endpoint_response(
         self,
@@ -76,12 +69,12 @@ class TestCheckJujuController():
         expected_state,
         mocked_responses,
         agent_conf_sample_path,
-        jujucontroller
+        jujucontroller,
     ):
         """Check that all known reponse bodies cause the related NRPE status."""
         mocked_responses.add(
             responses.GET,
-            'https://localhost:{}/health'.format(jujucontroller.apiport),
+            "https://localhost:{}/health".format(jujucontroller.apiport),
             body=response,
             status=200,
         )
diff --git a/src/tests/unit/test_lib_juju_controller.py b/src/tests/unit/test_lib_juju_controller.py
index e35d436..03bae5b 100644
--- a/src/tests/unit/test_lib_juju_controller.py
+++ b/src/tests/unit/test_lib_juju_controller.py
@@ -2,11 +2,11 @@
 """Pytest test cases for lib_juju_controller.py."""
 
 EXPECTED = {
-    'machine-id': '99',
-    'services': ['juju-db', 'jujud-machine-99'],
-    'version': '2.7.6',
-    'apiport': 17070,
-    'cacert': '''-----BEGIN CERTIFICATE-----
+    "machine-id": "99",
+    "services": ["juju-db", "jujud-machine-99"],
+    "version": "2.7.6",
+    "apiport": 17070,
+    "cacert": """-----BEGIN CERTIFICATE-----
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
 CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
@@ -33,29 +33,29 @@ EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
 -----END CERTIFICATE-----
-'''
+""",
 }
 
 
-class TestJujuControllerLib():
+class TestJujuControllerLib:
     """Class collecting all tests for the charm library."""
 
     def test_machine_id(self, jujucontroller):
         """Test parsing the machine id."""
-        assert jujucontroller._machine_id() == EXPECTED['machine-id']
+        assert jujucontroller._machine_id() == EXPECTED["machine-id"]
 
     def test_services(self, jujucontroller):
         """Test collecting all juju services."""
-        assert jujucontroller.services == EXPECTED['services']
+        assert jujucontroller.services == EXPECTED["services"]
 
     def test_version(self, jujucontroller):
         """Test reporting the controller version."""
-        assert jujucontroller.version == EXPECTED['version']
+        assert jujucontroller.version == EXPECTED["version"]
 
     def test_apiport(self, jujucontroller):
         """Test reporting the API port."""
-        assert jujucontroller.apiport == EXPECTED['apiport']
+        assert jujucontroller.apiport == EXPECTED["apiport"]
 
     def test_cacert(self, jujucontroller):
         """Test reporting the CA certificate that signed the controller cert."""
-        assert jujucontroller.cacert == EXPECTED['cacert']
+        assert jujucontroller.cacert == EXPECTED["cacert"]
diff --git a/src/tox.ini b/src/tox.ini
index fc17be2..463f0a4 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -25,7 +25,7 @@ passenv =
 [testenv:lint]
 commands =
     flake8
-#TODO    black --check --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" .
+    black --check --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" .
 deps =
     black
     flake8
@@ -43,8 +43,7 @@ exclude =
     mod,
     .build
 
-max-line-length = 100
-#TODO max-line-length = 88
+max-line-length = 88
 max-complexity = 10
 
 [testenv:black]