Merge ~axino/charm-telegraf/+git/telegraf-charm:fix_unit_tests into ~telegraf-charmers/charm-telegraf:master

[Junien F]

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.

[Tom Haddon (mthaddon)]

A few lint failures (some unrelated to this change, but would be good to fix unit_tests/test_telegraf.py at least:

$ make lint
tox -e lint
lint create: /home/ubuntu/fix-unit-tests/.tox/lint
lint installdeps: flake8
lint installed: flake8==3.6.0,mccabe==0.6.1,pkg-resources==0.0.0,pycodestyle==2.4.0,pyflakes==2.0.0
lint runtests: PYTHONHASHSEED='1702027581'
lint runtests: commands[0] | flake8 reactive/ unit_tests/ tests/
reactive/telegraf.py:843:7: W605 invalid escape sequence '\d'
reactive/telegraf.py:846:7: W605 invalid escape sequence '\d'
reactive/telegraf.py:850:7: W605 invalid escape sequence '\d'
reactive/telegraf.py:854:7: W605 invalid escape sequence '\d'
reactive/telegraf.py:906:13: W504 line break after binary operator
unit_tests/test_telegraf.py:693:5: F841 local variable 'network_get' is assigned to but never used
unit_tests/test_telegraf.py:815:5: F841 local variable 'network_get' is assigned to but never used
ERROR: InvocationError: '/home/ubuntu/fix-unit-tests/.tox/lint/bin/flake8 reactive/ unit_tests/ tests/'
________________________________________________________________________________________________________________________________________ summary _________________________________________________________________________________________________________________________________________
ERROR: lint: commands failed
Makefile:19: recipe for target 'lint' failed
make: *** [lint] Error 1

Otherwise looks good.

[Stuart Bishop (stub)]

Looks good to land, once the lint is cleaned up per mthaddon's comment.

review: Approve

[Junien F (axino)]

On cosmic :

% make lint
tox -e lint
lint installed: flake8==3.5.0,mccabe==0.6.1,pkg-resources==0.0.0,pycodestyle==2.3.1,pyflakes==1.6.0
lint runtests: PYTHONHASHSEED='4188387134'
lint runtests: commands[0] | flake8 reactive/ unit_tests/ tests/
______________________________________________________________________ summary _______________________________________________________________________
  lint: commands succeeded
  congratulations :)

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

Change successfully merged at revision dee9926ef323ee1bab11dc48496078606e099dc3

diff --git a/unit_tests/test_telegraf.py b/unit_tests/test_telegraf.py
index 3071b10..9fc6739 100644
--- a/unit_tests/test_telegraf.py
+++ b/unit_tests/test_telegraf.py
@@ -176,6 +176,24 @@ def test_get_remote_unit_name_juju1(monkeypatch):
                        'prometheus-rules': {'interface': 'prometheus-rules'}}}
     monkeypatch.setattr(telegraf.hookenv, 'metadata', lambda: md)
 
+    def relation_ids(reltype):
+        if reltype == 'juju-info':
+            return ['juju-info:0']
+        else:
+            return []
+    monkeypatch.setattr(telegraf.hookenv,
+                        'relation_ids',
+                        relation_ids)
+
+    def related_units(relid):
+        if relid == 'juju-info:0':
+            return ['remote/0']
+        else:
+            return []
+    monkeypatch.setattr(telegraf.hookenv,
+                        'related_units',
+                        related_units)
+
     relations = []
     monkeypatch.setattr(telegraf.hookenv,
                         'relations_of_type',
@@ -663,8 +681,19 @@ def test_prometheus_client_output(mocker, monkeypatch, config):
     config['prometheus_output_port'] = ''  # Not enabled globally
     monkeypatch.setattr(telegraf.hookenv, 'open_port',
                         lambda p: None)
+
+    relation_ids = ['prometheus-client:0']
+    monkeypatch.setattr(telegraf.hookenv,
+                        'relation_ids',
+                        lambda r: relation_ids)
+
     network_get_primary_address = mocker.patch.object(
         telegraf.hookenv, 'network_get_primary_address', return_value="foo")
+
+    mocker.patch.object(
+        telegraf.hookenv, 'network_get',
+        return_value={"ingress_addresses": ["1.2.3.4"]})
+
     interface = mocker.Mock(spec=RelationBase)
     interface.configure = mocker.Mock()
     telegraf.prometheus_client(interface)
@@ -696,7 +725,7 @@ def test_basic_config(mocker, monkeypatch, config):
     monkeypatch.setattr(telegraf.host, 'service_running',
                         lambda n: True)
     check_prometheus_port = mocker.patch('reactive.telegraf.check_prometheus_port')
-    bus.set_state('telegraf.installed')
+    bus.set_state('apt.installed.telegraf')
     assert not base_dir().join('telegraf.conf').exists()
     bus.dispatch()
     assert 'telegraf.configured' in bus.get_states().keys()
@@ -711,7 +740,7 @@ def test_config_no_prometheus(mocker, monkeypatch, config):
                         lambda n: True)
     check_prometheus_port = mocker.patch('reactive.telegraf.check_prometheus_port')
     config['prometheus_output_port'] = ''
-    bus.set_state('telegraf.installed')
+    bus.set_state('apt.installed.telegraf')
     assert not base_dir().join('telegraf.conf').exists()
     bus.dispatch()
     assert 'telegraf.configured' in bus.get_states().keys()
@@ -725,6 +754,7 @@ def test_config_changed_apt(mocker, monkeypatch, config):
     monkeypatch.setattr(telegraf.host, 'service_running',
                         lambda n: True)
     mocker.patch('reactive.telegraf.check_prometheus_port')
+    bus.set_state('apt.installed.telegraf')
     bus.set_state('config.changed')
     bus.dispatch()
     service_restart.assert_called_once_with('telegraf')
@@ -740,6 +770,7 @@ def test_config_changed_extra_options(mocker, monkeypatch, config):
     config.save()
     config.load_previous()
     config['extra_options'] = yaml.dump({'inputs': {'haproxy': {'timeout': 10}}})
+    bus.set_state('apt.installed.telegraf')
     bus.set_state('config.changed')
     bus.dispatch()
     assert 'plugins.haproxy.configured' not in bus.get_states().keys()
@@ -762,6 +793,7 @@ def test_config_changed_extra_plugins(mocker, monkeypatch, config):
 [[outputs.baz]]
     option = "enabled"
     """
+    bus.set_state('apt.installed.telegraf')
     bus.set_state('config.changed')
     bus.dispatch()
     assert configs_dir().join('extra_plugins.conf').exists()
@@ -776,6 +808,13 @@ def test_restart_on_output_plugin_relation_departed(mocker, monkeypatch, config)
     monkeypatch.setattr(telegraf.hookenv, 'relations_of_type', lambda n: [])
     monkeypatch.setattr(telegraf.hookenv, 'open_port',
                         lambda p: None)
+    relation_ids = ['prometheus-client:0']
+    monkeypatch.setattr(telegraf.hookenv,
+                        'relation_ids',
+                        lambda r: relation_ids)
+    mocker.patch.object(
+        telegraf.hookenv, 'network_get',
+        return_value={"ingress_addresses": ["1.2.3.4"]})
     config['prometheus_output_port'] = ''
     bus.discover()
     bus.set_state('telegraf.installed')