From d3c14e64915581b392744789e8933f5511292afb Mon Sep 17 00:00:00 2001 From: Mitsuo Takaki Date: Sun, 18 Mar 2018 17:44:01 -0700 Subject: [PATCH] Addressing codacy issues --- cachet_url_monitor/configuration.py | 5 +++-- tests/test_expectation.py | 2 +- tests/test_latency_unit.py | 21 +++++++++++---------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/cachet_url_monitor/configuration.py b/cachet_url_monitor/configuration.py index 2132eba..f33d2b8 100644 --- a/cachet_url_monitor/configuration.py +++ b/cachet_url_monitor/configuration.py @@ -294,9 +294,10 @@ class Expectaction(object): class HttpStatus(Expectaction): def __init__(self, configuration): - self.status_range = self.parse_range(configuration['status_range']) + self.status_range = HttpStatus.parse_range(configuration['status_range']) - def parse_range(self, range_string): + @staticmethod + def parse_range(range_string): statuses = range_string.split("-") if len(statuses) == 1: # When there was no range given, we should treat the first number as a single status check. diff --git a/tests/test_expectation.py b/tests/test_expectation.py index e0483f2..6f8fd8f 100644 --- a/tests/test_expectation.py +++ b/tests/test_expectation.py @@ -66,7 +66,7 @@ class HttpStatusTest(unittest.TestCase): def test_init_with_invalid_number(self): """Invalid values should just fail with a ValueError, as we can't convert it to int.""" - with pytest.raises(ValueError) as excinfo: + with pytest.raises(ValueError): self.expectation = HttpStatus({'type': 'HTTP_STATUS', 'status_range': "foo"}) def test_get_status_healthy(self): diff --git a/tests/test_latency_unit.py b/tests/test_latency_unit.py index 7257b2b..7773049 100644 --- a/tests/test_latency_unit.py +++ b/tests/test_latency_unit.py @@ -1,18 +1,19 @@ #!/usr/bin/env python -import unittest from cachet_url_monitor.latency_unit import convert_to_unit -class ConfigurationTest(unittest.TestCase): - def test_convert_to_unit_ms(self): - assert convert_to_unit("ms", 1) == 1000 +def test_convert_to_unit_ms(): + assert convert_to_unit("ms", 1) == 1000 - def test_convert_to_unit_s(self): - assert convert_to_unit("s", 20) == 20 - def test_convert_to_unit_m(self): - assert convert_to_unit("m", 3) == float(3) / 60 +def test_convert_to_unit_s(): + assert convert_to_unit("s", 20) == 20 - def test_convert_to_unit_h(self): - assert convert_to_unit("h", 7200) == 2 + +def test_convert_to_unit_m(): + assert convert_to_unit("m", 3) == float(3) / 60 + + +def test_convert_to_unit_h(): + assert convert_to_unit("h", 7200) == 2