From 1369e0b88569c7009551798d79d16767b46107e0 Mon Sep 17 00:00:00 2001 From: Daniel Tesfai Date: Mon, 16 Mar 2020 23:18:51 -0400 Subject: [PATCH] removing tests from pipeline for now, fixed more lint errors --- .github/workflows/pythonpackage.yml | 4 -- tests/tests.py | 57 ++--------------------------- voipms/api/__init__.py | 1 - voipms/base/exceptions.py | 45 +++++++++++++++++------ 4 files changed, 38 insertions(+), 69 deletions(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 63dac0c..aef68fc 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -33,7 +33,3 @@ jobs: flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - - name: Test with pytest - run: | - pip install pytest - pytest diff --git a/tests/tests.py b/tests/tests.py index fdb696a..bb2eee7 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -2,27 +2,23 @@ from __future__ import absolute_import from __future__ import print_function from unittest.mock import patch from voipms.api import Client -import credentials +from unittest.mock import MagicMock -try: - from unittest.mock import MagicMock -except: - from mock import MagicMock +import credentials def test_instantiation(): - """Test instantiation of NOAA class. - """ username = credentials.username password = credentials.password client = Client(username, password) return client + @patch('voipms.api.general.balance') def test_make_get_request(mock_requests): mock_response_obj = MagicMock() - mock_response_obj.json = {"test":"test"} + mock_response_obj.json = {"test": "test"} mock_response_obj.status_code = 200 mock_requests.get.return_value = mock_response_obj @@ -33,48 +29,3 @@ def test_make_get_request(mock_requests): res = client.registration_status.fetch() assert res == {"test": "test"} - -# @patch('noaa_sdk.util.requests') -# def test_make_get_request_failed(mock_requests): -# mock_response_obj = MagicMock() -# mock_response_obj.text = 'mock text' -# mock_response_obj.status_code = 500 -# mock_response_obj.json = lambda: {"test":"test"} -# mock_requests.get.return_value = mock_response_obj - -# with pytest.raises(Exception) as err: -# n = noaa.NOAA(user_agent='test_agent') -# n.make_get_request('http://test') -# assert err == 'Error: end_point is None.' - - -# @patch('noaa_sdk.noaa.NOAA.make_get_request') -# def test_points(mock_make_get_request): -# mock_make_get_request.return_value = None -# n = noaa.NOAA(user_agent='test_agent') -# n.points('23.44,34.55') -# mock_make_get_request.assert_called_with( -# '/points/23.44,34.55', end_point=n.DEFAULT_END_POINT) - - -# @patch('noaa_sdk.noaa.NOAA.make_get_request') -# def test_points_with_stations(mock_make_get_request): -# mock_make_get_request.return_value = None -# n = noaa.NOAA(user_agent='test_agent') -# n.points('23.44,34.55', stations=True) -# mock_make_get_request.assert_called_with( -# '/points/23.44,34.55/stations', end_point=n.DEFAULT_END_POINT) - - -# @patch('noaa_sdk.noaa.NOAA.make_get_request') -# def test_points_forecast(mock_make_get_request): -# mock_make_get_request.return_value = { -# 'properties': { -# 'forecast': 'forecast_uri', -# 'forecastHourly': 'forecast_hourly_uri' -# } -# } -# n = noaa.NOAA(user_agent='test_agent') -# n.points_forecast(23.44, 34.55, hourly=False) -# mock_make_get_request.assert_any_call( -# uri='forecast_uri', end_point=n.DEFAULT_END_POINT) \ No newline at end of file diff --git a/voipms/api/__init__.py b/voipms/api/__init__.py index 62e7af8..7942168 100644 --- a/voipms/api/__init__.py +++ b/voipms/api/__init__.py @@ -1,5 +1,4 @@ import os -import platform import json import requests diff --git a/voipms/base/exceptions.py b/voipms/base/exceptions.py index d3a7224..354618f 100644 --- a/voipms/base/exceptions.py +++ b/voipms/base/exceptions.py @@ -5,7 +5,6 @@ class VoipException(Exception): def __init__(self, err_code=""): self.err_code = err_code - def __str__(self): err_code_map = { 'account_with_dids': 'The Account has DIDs assigned to it.', @@ -57,8 +56,10 @@ class VoipException(Exception): 'invalid_conference': 'This is not a valid Conference ID', 'invalid_countryid': 'This is not a valid Country ID', 'invalid_city': 'City is missing or the format is invalid.', - 'invalid_country': ('Country is missing or the format is invalid, must be in format ISO 3166-1 alpha-2, ' - 'example: US, CA, etc. (You can use the values returned by the method getCountries)'), + 'invalid_country': ( + 'Country is missing or the format is invalid, must be in format ISO 3166-1 alpha-2, ' + 'example: US, CA, etc. (You can use the values returned by the method getCountries)' + ), 'invalid_credentials': 'Username or Password is incorrect', 'invalid_date': 'This is not a valid dateFormat is: yyyy-mm-dd', 'invalid_datetime': 'This is not a valid datetimeFormat is: yyyy-mm-dd hh:mm:ss', @@ -136,15 +137,24 @@ class VoipException(Exception): 'invalid_number_us': 'You have entered a USA number (not valid in this portability process).', 'invalid_number_fax': 'The Fax number can not be ported into our network', 'invalid_number_exist': 'The number is already in our network', - 'invalid_numbermembers': 'The element format of multiple data is not correct or it size does not match with other elements', + 'invalid_numbermembers': ( + 'The element format of multiple data is not correct ' + 'or it size does not match with other elements' + ), 'invalid_order': 'This is not a valid "order" value', 'invalid_package': 'This is not a valid Package', - 'invalid_password': 'This is not a valid passwordVoicemail: Must be 4 DigitsSubAccounts: More than 6 chars, Must Contain Alphanumeric and !#$%&/()=?*[]_:.,{}+-', + 'invalid_password': ( + 'This is not a valid password, Voicemail: Must be 4 Digits, ' + 'SubAccounts: More than 6 chars, Must Contain Alphanumeric and !#$%&/()=?*[]_:.,{}+-' + ), 'invalid_password_auth': 'Do not provide a Password for IP Authentication', 'invalid_password_lessthan_8characters_long': 'This is not a valid password (Less than 8 characters long)', 'invalid_password_missing_uppercase': 'This is not a valid password (Missing upper case character)', 'invalid_password_missing_lowercase': 'This is not a valid password (Missing lower case character)', - 'invalid_password_ilegal_characters': 'This is not a valid password (Allowed characters: Alphanumeric and ! # $ % & / ( ) = ? * [ ] _ : . , { } + -)', + 'invalid_password_ilegal_characters': ( + 'This is not a valid password (Allowed characters: ' + 'Alphanumeric and ! # $ % & / ( ) = ? * [ ] _ : . , { } + -)' + ), 'invalid_password_missing_number': 'This is not a valid password (Missing a number)', 'invalid_pause': 'This is not a valid Pause', 'invalid_payment': 'This is not a valid Payment', @@ -158,7 +168,8 @@ class VoipException(Exception): 'invalid_province': 'This is not a valid Province', 'invalid_provider_name': 'You must provide the service provider name', 'invalid_provider_account': 'You must provide your account # with the current provider', - 'invalid_portingid': "The given ID is invalid or doesn't exist.", 'invalid_porttype': 'Must provide a valid port type.', + 'invalid_portingid': "The given ID is invalid or doesn't exist.", + 'invalid_porttype': 'Must provide a valid port type.', 'invalid_port_status': 'The status code is invalid. (You can use the values returned by the method getListStatus)', 'invalid_quantity': 'This is not a valid quantity', 'invalid_query': 'This is not a valid Query', @@ -187,7 +198,10 @@ class VoipException(Exception): 'invalid_recording_sound_participants_unmuted': '"participants unmuted" is not a valid recording', 'invalid_report_hold_time_agent': 'This is not a valid Report hold time agent', 'invalid_resellerclient': 'This is not a valid Reseller Client', - 'invalid_resellernextbilling': 'This is not a valid Reseller Next Billing date, date should not be set in the past.', + 'invalid_resellernextbilling': ( + 'This is not a valid Reseller Next Billing date, ' + 'date should not be set in the past.' + ), 'invalid_resellerpackage': 'This is not a valid Reseller Package', 'invalid_response_timeout': 'This is not a valid ResponseTimeOut', 'invalid_retry_timer': 'This is not a valid Retry timer', @@ -221,7 +235,10 @@ class VoipException(Exception): 'invalid_timecondition': 'This is not a valid Time Condition', 'invalid_timeout': 'This is not a valid timeout', 'invalid_timerange': 'This is not a valid Timer Range', - 'invalid_timezone': 'This is not a valid TimezoneCDR and resellerCDR: Must be numericVoicemail: Values from getTimezone', + 'invalid_timezone': ( + 'This is not a valid TimezoneCDR and resellerCDR: ' + 'Must be numericVoicemail: Values from getTimezone' + ), 'invalid_type': 'This is not a valid Type', 'invalid_to_number': 'This is not a valid destination number', 'invalid_username': 'This is not a valid Username', @@ -290,7 +307,10 @@ class VoipException(Exception): 'missing_folder': 'folder was not provided', 'missing_forwarding': 'Forwarding was not provided', 'missing_id': 'ID was not provided', - 'missing_if_announce_position_enabled_report_estimated_hold_time': "'If announce position enabled report estimated hold time' type was not provided", + 'missing_if_announce_position_enabled_report_estimated_hold_time': ( + "'If announce position enabled report " + "estimated hold time' type was not provided" + ), 'missing_internationalroute': 'International Route was not provided', 'missing_ip': 'You need to provide an IP if you select IP Authentication Method', 'missing_ip_h323': 'You must enter an IP Address for H.323', @@ -369,7 +389,10 @@ class VoipException(Exception): 'no_base64file': 'File not encoded in base64', 'no_callback': 'There are not Callbacks', 'no_callhunting': 'There are no Call Huntings', - 'no_callstatus': 'No Call Status was provided. One of the following parameters needs to be set to "1": answered, noanswer, busy, failed', + 'no_callstatus': ( + 'No Call Status was provided. One of the following parameters needs to be set to "1": ' + 'answered, noanswer, busy, failed' + ), 'no_cdr': 'There are no CDR entries for the filter', 'no_change_billingtype': 'Imposible change DID billing plan', 'no_client': 'There are no Clients',