From 9e5d42f8b855c50090d9a25730430815b6a11ae2 Mon Sep 17 00:00:00 2001 From: Mitsuo Takaki Date: Thu, 24 Oct 2019 21:31:04 -0700 Subject: [PATCH] Fixing broken build, due to updates to the libraries --- .circleci/config.yml | 1 + cachet_url_monitor/configuration.py | 3 ++- dev_requirements.txt | 11 +++----- requirements.txt | 6 ++--- tests/test_configuration.py | 42 ++++++++++++++--------------- 5 files changed, 31 insertions(+), 32 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7fa4763..b736040 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,6 +29,7 @@ jobs: virtualenv . source bin/activate pip3 install -r dev_requirements.txt + pip3 install -r requirements.txt python3 setup.py install pip3 install coveralls diff --git a/cachet_url_monitor/configuration.py b/cachet_url_monitor/configuration.py index d03b015..79aefba 100644 --- a/cachet_url_monitor/configuration.py +++ b/cachet_url_monitor/configuration.py @@ -9,6 +9,7 @@ import time import requests from yaml import dump from yaml import load +from yaml import FullLoader import cachet_url_monitor.latency_unit as latency_unit import cachet_url_monitor.status as st @@ -80,7 +81,7 @@ class Configuration(object): def __init__(self, config_file): self.logger = logging.getLogger('cachet_url_monitor.configuration.Configuration') self.config_file = config_file - self.data = load(open(self.config_file, 'r')) + self.data = load(open(self.config_file, 'r'), Loader=FullLoader) self.current_fails = 0 self.trigger_update = True diff --git a/dev_requirements.txt b/dev_requirements.txt index 370bef3..86dfa4d 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,10 +1,7 @@ -PyYAML==4.2b1 -codacy-coverage==1.2.18 -ipython==4.2.0 +codacy-coverage==1.3.11 +ipython==7.8.0 mock==2.0.0 pudb==2016.1 -pytest==3.4.2 -pytest-cov==2.5.1 -requests==2.21.0 -schedule==0.5.0 +pytest==5.2.2 +pytest-cov==2.8.1 coverage==4.5.2 diff --git a/requirements.txt b/requirements.txt index ba95f70..53629cf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -PyYAML==4.2b1 -requests==2.21.0 -schedule==0.5.0 +PyYAML==5.1.2 +requests==2.22.0 +schedule==0.6.0 diff --git a/tests/test_configuration.py b/tests/test_configuration.py index 67c69f9..e0c5eb6 100644 --- a/tests/test_configuration.py +++ b/tests/test_configuration.py @@ -38,9 +38,9 @@ class ConfigurationTest(unittest.TestCase): def test_init(self): self.assertEqual(len(self.configuration.data), 3, 'Number of root elements in config.yml is incorrect') - self.assertEquals(len(self.configuration.expectations), 3, 'Number of expectations read from file is incorrect') + self.assertEqual(len(self.configuration.expectations), 3, 'Number of expectations read from file is incorrect') self.assertDictEqual(self.configuration.headers, {'X-Cachet-Token': 'token2'}, 'Header was not set correctly') - self.assertEquals(self.configuration.api_url, 'https://demo.cachethq.io/api/v1', + self.assertEqual(self.configuration.api_url, 'https://demo.cachethq.io/api/v1', 'Cachet API URL was set incorrectly') self.assertDictEqual(self.configuration.endpoint_header, {'SOME-HEADER': 'SOME-VALUE'}, 'Header is incorrect') @@ -59,7 +59,7 @@ class ConfigurationTest(unittest.TestCase): sys.modules['requests'].request = request self.configuration.evaluate() - self.assertEquals(self.configuration.status, cachet_url_monitor.status.COMPONENT_STATUS_OPERATIONAL, + self.assertEqual(self.configuration.status, cachet_url_monitor.status.COMPONENT_STATUS_OPERATIONAL, 'Component status set incorrectly') def test_evaluate_without_header(self): @@ -77,7 +77,7 @@ class ConfigurationTest(unittest.TestCase): sys.modules['requests'].request = request self.configuration.evaluate() - self.assertEquals(self.configuration.status, cachet_url_monitor.status.COMPONENT_STATUS_OPERATIONAL, + self.assertEqual(self.configuration.status, cachet_url_monitor.status.COMPONENT_STATUS_OPERATIONAL, 'Component status set incorrectly') def test_evaluate_with_failure(self): @@ -96,57 +96,57 @@ class ConfigurationTest(unittest.TestCase): sys.modules['requests'].request = request self.configuration.evaluate() - self.assertEquals(self.configuration.status, cachet_url_monitor.status.COMPONENT_STATUS_PARTIAL_OUTAGE, + self.assertEqual(self.configuration.status, cachet_url_monitor.status.COMPONENT_STATUS_PARTIAL_OUTAGE, 'Component status set incorrectly') def test_evaluate_with_timeout(self): def request(method, url, headers, timeout=None): - self.assertEquals(method, 'GET', 'Incorrect HTTP method') - self.assertEquals(url, 'http://localhost:8080/swagger', 'Monitored URL is incorrect') - self.assertEquals(timeout, 0.010) + self.assertEqual(method, 'GET', 'Incorrect HTTP method') + self.assertEqual(url, 'http://localhost:8080/swagger', 'Monitored URL is incorrect') + self.assertEqual(timeout, 0.010) raise Timeout() sys.modules['requests'].request = request self.configuration.evaluate() - self.assertEquals(self.configuration.status, cachet_url_monitor.status.COMPONENT_STATUS_PERFORMANCE_ISSUES, + self.assertEqual(self.configuration.status, cachet_url_monitor.status.COMPONENT_STATUS_PERFORMANCE_ISSUES, 'Component status set incorrectly') self.mock_logger.warning.assert_called_with('Request timed out') def test_evaluate_with_connection_error(self): def request(method, url, headers, timeout=None): - self.assertEquals(method, 'GET', 'Incorrect HTTP method') - self.assertEquals(url, 'http://localhost:8080/swagger', 'Monitored URL is incorrect') - self.assertEquals(timeout, 0.010) + self.assertEqual(method, 'GET', 'Incorrect HTTP method') + self.assertEqual(url, 'http://localhost:8080/swagger', 'Monitored URL is incorrect') + self.assertEqual(timeout, 0.010) raise ConnectionError() sys.modules['requests'].request = request self.configuration.evaluate() - self.assertEquals(self.configuration.status, cachet_url_monitor.status.COMPONENT_STATUS_PARTIAL_OUTAGE, + self.assertEqual(self.configuration.status, cachet_url_monitor.status.COMPONENT_STATUS_PARTIAL_OUTAGE, 'Component status set incorrectly') self.mock_logger.warning.assert_called_with('The URL is unreachable: GET http://localhost:8080/swagger') def test_evaluate_with_http_error(self): def request(method, url, headers, timeout=None): - self.assertEquals(method, 'GET', 'Incorrect HTTP method') - self.assertEquals(url, 'http://localhost:8080/swagger', 'Monitored URL is incorrect') - self.assertEquals(timeout, 0.010) + self.assertEqual(method, 'GET', 'Incorrect HTTP method') + self.assertEqual(url, 'http://localhost:8080/swagger', 'Monitored URL is incorrect') + self.assertEqual(timeout, 0.010) raise HTTPError() sys.modules['requests'].request = request self.configuration.evaluate() - self.assertEquals(self.configuration.status, cachet_url_monitor.status.COMPONENT_STATUS_PARTIAL_OUTAGE, + self.assertEqual(self.configuration.status, cachet_url_monitor.status.COMPONENT_STATUS_PARTIAL_OUTAGE, 'Component status set incorrectly') self.mock_logger.exception.assert_called_with('Unexpected HTTP response') def test_push_status(self): def put(url, params=None, headers=None): - self.assertEquals(url, 'https://demo.cachethq.io/api/v1/components/1', 'Incorrect cachet API URL') + self.assertEqual(url, 'https://demo.cachethq.io/api/v1/components/1', 'Incorrect cachet API URL') self.assertDictEqual(params, {'id': 1, 'status': 1}, 'Incorrect component update parameters') self.assertDictEqual(headers, {'X-Cachet-Token': 'token2'}, 'Incorrect component update parameters') @@ -155,13 +155,13 @@ class ConfigurationTest(unittest.TestCase): return response sys.modules['requests'].put = put - self.assertEquals(self.configuration.status, cachet_url_monitor.status.COMPONENT_STATUS_OPERATIONAL, + self.assertEqual(self.configuration.status, cachet_url_monitor.status.COMPONENT_STATUS_OPERATIONAL, 'Incorrect component update parameters') self.configuration.push_status() def test_push_status_with_failure(self): def put(url, params=None, headers=None): - self.assertEquals(url, 'https://demo.cachethq.io/api/v1/components/1', 'Incorrect cachet API URL') + self.assertEqual(url, 'https://demo.cachethq.io/api/v1/components/1', 'Incorrect cachet API URL') self.assertDictEqual(params, {'id': 1, 'status': 1}, 'Incorrect component update parameters') self.assertDictEqual(headers, {'X-Cachet-Token': 'token2'}, 'Incorrect component update parameters') @@ -170,6 +170,6 @@ class ConfigurationTest(unittest.TestCase): return response sys.modules['requests'].put = put - self.assertEquals(self.configuration.status, cachet_url_monitor.status.COMPONENT_STATUS_OPERATIONAL, + self.assertEqual(self.configuration.status, cachet_url_monitor.status.COMPONENT_STATUS_OPERATIONAL, 'Incorrect component update parameters') self.configuration.push_status()