Skip to content

Commit

Permalink
style: Run pylint
Browse files Browse the repository at this point in the history 
Run pylint and fix it's issues in subscription.py and
test_subscriptions.py.

Relates #13
  • Loading branch information
litleleprikon committed Dec 23, 2019
1 parent 65aff59 commit e9033d9
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 71 deletions.
128 changes: 74 additions & 54 deletions moira_client/models/subscription.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,26 @@
from ..client import ResponseStructureError
from .base import Base

DAYS_OF_WEEK = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
DAYS_OF_WEEK = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]

MINUTES_IN_HOUR = 60


class Subscription(Base):
def __init__(self, client, tags, contacts=None, enabled=None, throttling=None, sched=None,
ignore_warnings=False, ignore_recoverings=False, plotting=None, any_tags=False, **kwargs):
def __init__(
self,
client,
tags,
contacts=None,
enabled=None,
throttling=None,
sched=None,
ignore_warnings=False,
ignore_recoverings=False,
plotting=None,
any_tags=False,
**kwargs
):
"""
:param client: api client
Expand All @@ -26,74 +38,76 @@ def __init__(self, client, tags, contacts=None, enabled=None, throttling=None, s
"""
self._client = client

self._id = kwargs.get('id', None)
self._id = kwargs.get("id", None)
self.tags = tags if not any_tags else []
if not contacts:
contacts = []
self.contacts = contacts
self.enabled = enabled
self.any_tags = any_tags
self.throttling = throttling
default_sched = {
'startOffset': 0,
'endOffset': 1439,
'tzOffset': 0
}
default_sched = {"startOffset": 0, "endOffset": 1439, "tzOffset": 0}
if not sched:
sched = default_sched
self.disabled_days = set()
else:
if 'days' in sched and sched['days'] is not None:
self.disabled_days = {day['name'] for day in sched['days'] if not day['enabled']}
if "days" in sched and sched["days"] is not None:
self.disabled_days = {
day["name"] for day in sched["days"] if not day["enabled"]
}
self.sched = sched

# compute time range
self._start_hour = self.sched['startOffset'] // MINUTES_IN_HOUR
self._start_minute = self.sched['startOffset'] - self._start_hour * MINUTES_IN_HOUR
self._end_hour = self.sched['endOffset'] // MINUTES_IN_HOUR
self._end_minute = self.sched['endOffset'] - self._end_hour * MINUTES_IN_HOUR
self._start_hour = self.sched["startOffset"] // MINUTES_IN_HOUR
self._start_minute = (
self.sched["startOffset"] - self._start_hour * MINUTES_IN_HOUR
)
self._end_hour = self.sched["endOffset"] // MINUTES_IN_HOUR
self._end_minute = self.sched["endOffset"] - self._end_hour * MINUTES_IN_HOUR

self.ignore_warnings = ignore_warnings
self.ignore_recoverings = ignore_recoverings

if not plotting:
plotting = {'enabled': False, 'theme': 'light'}
plotting = {"enabled": False, "theme": "light"}
self.plotting = plotting

def _send_request(self, subscription_id=None):
data = {
'contacts': self.contacts,
'tags': self.tags,
'enabled': self.enabled,
'throttling': self.throttling,
'sched': self.sched,
'ignore_warnings': self.ignore_warnings,
'ignore_recoverings': self.ignore_recoverings,
'plotting': self.plotting
"contacts": self.contacts,
"tags": self.tags,
"enabled": self.enabled,
"throttling": self.throttling,
"sched": self.sched,
"ignore_warnings": self.ignore_warnings,
"ignore_recoverings": self.ignore_recoverings,
"plotting": self.plotting,
}

if subscription_id:
data['id'] = subscription_id
data["id"] = subscription_id

data['sched']['days'] = []
data["sched"]["days"] = []
for day in DAYS_OF_WEEK:
day_info = {
'enabled': True if day not in self.disabled_days else False,
'name': day
"enabled": True if day not in self.disabled_days else False,
"name": day,
}
data['sched']['days'].append(day_info)
data["sched"]["days"].append(day_info)

data['sched']['startOffset'] = self._start_hour * MINUTES_IN_HOUR + self._start_minute
data['sched']['endOffset'] = self._end_hour * MINUTES_IN_HOUR + self._end_minute
data["sched"]["startOffset"] = (
self._start_hour * MINUTES_IN_HOUR + self._start_minute
)
data["sched"]["endOffset"] = self._end_hour * MINUTES_IN_HOUR + self._end_minute

if subscription_id:
result = self._client.put('subscription/' + subscription_id, json=data)
result = self._client.put("subscription/" + subscription_id, json=data)
else:
result = self._client.put('subscription', json=data)
if 'id' not in result:
result = self._client.put("subscription", json=data)
if "id" not in result:
raise ResponseStructureError("id doesn't exist in response", result)

self._id = result['id']
self._id = result["id"]
return self._id

def disable_day(self, day):
Expand Down Expand Up @@ -132,28 +146,22 @@ def add_contact(self, contact_id):
"""
self.contacts.append(contact_id)

def enable_plotting(self, theme='light'):
def enable_plotting(self, theme="light"):
"""
Enable plotting
:param theme: str plotting theme
:return: None
"""
self.plotting = {
'enabled': True,
'theme': theme
}
self.plotting = {"enabled": True, "theme": theme}

def disable_plotting(self):
"""
Disable plotting
:return: None
"""
self.plotting = {
'enabled': False,
'theme': 'light'
}
self.plotting = {"enabled": False, "theme": "light"}

def save(self):
"""
Expand Down Expand Up @@ -229,9 +237,9 @@ def fetch_all(self):
:raises: ResponseStructureError
"""
result = self._client.get(self._full_path())
if 'list' in result:
if "list" in result:
subscriptions = []
for subscription in result['list']:
for subscription in result["list"]:
subscriptions.append(Subscription(self._client, **subscription))
return subscriptions
else:
Expand Down Expand Up @@ -259,8 +267,19 @@ def is_exist(self, **kwargs):
return True
return False

def create(self, tags, contacts=None, enabled=True, throttling=True, sched=None,
ignore_warnings=False, ignore_recoverings=False, plotting=None, any_tags=False, **kwargs):
def create(
self,
tags,
contacts=None,
enabled=True,
throttling=True,
sched=None,
ignore_warnings=False,
ignore_recoverings=False,
plotting=None,
any_tags=False,
**kwargs
):
"""
Create new subscription.
Expand All @@ -280,7 +299,7 @@ def create(self, tags, contacts=None, enabled=True, throttling=True, sched=None,
return Subscription(
self._client,
tags,
contacts,
contacts,
enabled,
throttling,
sched,
Expand All @@ -301,7 +320,7 @@ def delete(self, subscription_id):
self._client.delete(self._full_path(subscription_id))
return False
except InvalidJSONError as e:
if e.content == b'': # successfully if response is blank
if e.content == b"": # successfully if response is blank
return True
return False

Expand All @@ -315,11 +334,12 @@ def test(self, subscription_id):
self._client.put(self._full_path(subscription_id) + "/test")
return False
except InvalidJSONError as e:
if e.content == b'': # successfully if response is blank
if e.content == b"": # successfully if response is blank
return True
return False

def _full_path(self, path=''):
def _full_path(self, path=""):
if path:
return 'subscription/' + path
return 'subscription'
return "subscription/" + path
return "subscription"

37 changes: 20 additions & 17 deletions tests/models/test_subscription.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,76 +13,79 @@


class SubscriptionTest(ModelTest):

def test_fetch_all(self):
client = Client(self.api_url)
subscription_manager = SubscriptionManager(client)

with patch.object(client, 'get', return_value={'list': []}) as get_mock:
with patch.object(client, "get", return_value={"list": []}) as get_mock:
subscription_manager.fetch_all()

self.assertTrue(get_mock.called)
get_mock.assert_called_with('subscription')
get_mock.assert_called_with("subscription")

def test_fetch_all_bad_response(self):
client = Client(self.api_url)
subscription_manager = SubscriptionManager(client)

with patch.object(client, 'get', return_value={}) as get_mock:
with patch.object(client, "get", return_value={}) as get_mock:
with self.assertRaises(ResponseStructureError):
subscription_manager.fetch_all()

self.assertTrue(get_mock.called)
get_mock.assert_called_with('subscription')
get_mock.assert_called_with("subscription")

def test_delete(self):
client = Client(self.api_url)
subscription_manager = SubscriptionManager(client)

subscription_id = '1'
subscription_id = "1"

with patch.object(client, 'delete', new=Mock(side_effect=InvalidJSONError(b''))) as delete_mock:
with patch.object(
client, "delete", new=Mock(side_effect=InvalidJSONError(b""))
) as delete_mock:
res = subscription_manager.delete(subscription_id)

self.assertTrue(delete_mock.called)
self.assertTrue(res)
delete_mock.assert_called_with('subscription/' + subscription_id)
delete_mock.assert_called_with("subscription/" + subscription_id)

def test_delete_fail(self):
client = Client(self.api_url)
subscription_manager = SubscriptionManager(client)

subscription_id = '1'
subscription_id = "1"

with patch.object(client, 'delete') as delete_mock:
with patch.object(client, "delete") as delete_mock:
res = subscription_manager.delete(subscription_id)

self.assertTrue(delete_mock.called)
self.assertFalse(res)
delete_mock.assert_called_with('subscription/' + subscription_id)
delete_mock.assert_called_with("subscription/" + subscription_id)

def test_test(self):
client = Client(self.api_url)
subscription_manager = SubscriptionManager(client)

subscription_id = '1'
subscription_id = "1"

with patch.object(client, 'put', new=Mock(side_effect=InvalidJSONError(b''))) as put_mock:
with patch.object(
client, "put", new=Mock(side_effect=InvalidJSONError(b""))
) as put_mock:
res = subscription_manager.test(subscription_id)

self.assertTrue(put_mock.called)
self.assertTrue(res)
put_mock.assert_called_with('subscription/' + subscription_id + '/test')
put_mock.assert_called_with("subscription/" + subscription_id + "/test")

def test_test_fail(self):
client = Client(self.api_url)
subscription_manager = SubscriptionManager(client)

subscription_id = '1'
subscription_id = "1"

with patch.object(client, 'put') as put_mock:
with patch.object(client, "put") as put_mock:
res = subscription_manager.test(subscription_id)

self.assertTrue(put_mock.called)
self.assertFalse(res)
put_mock.assert_called_with('subscription/' + subscription_id + '/test')
put_mock.assert_called_with("subscription/" + subscription_id + "/test")

0 comments on commit e9033d9

Please sign in to comment.