Skip to content

Commit 9a455f6

Browse files
authored
refact: fix warnings in pytest output (#297)
1 parent ce0827d commit 9a455f6

File tree

2 files changed

+41
-37
lines changed

2 files changed

+41
-37
lines changed

tests/helpers_tests/test_event_tag_utils.py

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,16 @@
1313

1414
import sys
1515
import unittest
16-
from optimizely import logger
16+
1717

1818
from optimizely.helpers import event_tag_utils
19+
from optimizely.logger import NoOpLogger
1920

2021

2122
class EventTagUtilsTest(unittest.TestCase):
23+
def setUp(self, *args, **kwargs):
24+
self.logger = NoOpLogger()
25+
2226
def test_get_revenue_value__invalid_args(self):
2327
""" Test that revenue value is not returned for invalid arguments. """
2428
self.assertIsNone(event_tag_utils.get_revenue_value(None))
@@ -82,70 +86,70 @@ def test_get_numeric_metric__value_tag(self):
8286

8387
# An integer should be cast to a float
8488
self.assertEqual(
85-
12345.0, event_tag_utils.get_numeric_value({'value': 12345}, logger=logger.SimpleLogger()),
89+
12345.0, event_tag_utils.get_numeric_value({'value': 12345}),
8690
)
8791

8892
# A string should be cast to a float
8993
self.assertEqual(
90-
12345.0, event_tag_utils.get_numeric_value({'value': '12345'}, logger=logger.SimpleLogger()),
94+
12345.0, event_tag_utils.get_numeric_value({'value': '12345'}, self.logger),
9195
)
9296

9397
# Valid float values
9498
some_float = 1.2345
9599
self.assertEqual(
96-
some_float, event_tag_utils.get_numeric_value({'value': some_float}, logger=logger.SimpleLogger()),
100+
some_float, event_tag_utils.get_numeric_value({'value': some_float}, self.logger),
97101
)
98102

99103
max_float = sys.float_info.max
100104
self.assertEqual(
101-
max_float, event_tag_utils.get_numeric_value({'value': max_float}, logger=logger.SimpleLogger()),
105+
max_float, event_tag_utils.get_numeric_value({'value': max_float}, self.logger),
102106
)
103107

104108
min_float = sys.float_info.min
105109
self.assertEqual(
106-
min_float, event_tag_utils.get_numeric_value({'value': min_float}, logger=logger.SimpleLogger()),
110+
min_float, event_tag_utils.get_numeric_value({'value': min_float}, self.logger),
107111
)
108112

109113
# Invalid values
110-
self.assertIsNone(event_tag_utils.get_numeric_value({'value': False}, logger=logger.SimpleLogger()))
111-
self.assertIsNone(event_tag_utils.get_numeric_value({'value': None}, logger=logger.SimpleLogger()))
114+
self.assertIsNone(event_tag_utils.get_numeric_value({'value': False}, self.logger))
115+
self.assertIsNone(event_tag_utils.get_numeric_value({'value': None}, self.logger))
112116

113-
numeric_value_nan = event_tag_utils.get_numeric_value({'value': float('nan')}, logger=logger.SimpleLogger())
117+
numeric_value_nan = event_tag_utils.get_numeric_value({'value': float('nan')}, self.logger)
114118
self.assertIsNone(numeric_value_nan, 'nan numeric value is {}'.format(numeric_value_nan))
115119

116-
numeric_value_array = event_tag_utils.get_numeric_value({'value': []}, logger=logger.SimpleLogger())
120+
numeric_value_array = event_tag_utils.get_numeric_value({'value': []}, self.logger)
117121
self.assertIsNone(numeric_value_array, 'Array numeric value is {}'.format(numeric_value_array))
118122

119-
numeric_value_dict = event_tag_utils.get_numeric_value({'value': []}, logger=logger.SimpleLogger())
123+
numeric_value_dict = event_tag_utils.get_numeric_value({'value': []}, self.logger)
120124
self.assertIsNone(numeric_value_dict, 'Dict numeric value is {}'.format(numeric_value_dict))
121125

122-
numeric_value_none = event_tag_utils.get_numeric_value({'value': None}, logger=logger.SimpleLogger())
126+
numeric_value_none = event_tag_utils.get_numeric_value({'value': None}, self.logger)
123127
self.assertIsNone(numeric_value_none, 'None numeric value is {}'.format(numeric_value_none))
124128

125129
numeric_value_invalid_literal = event_tag_utils.get_numeric_value(
126-
{'value': '1,234'}, logger=logger.SimpleLogger()
130+
{'value': '1,234'}, self.logger
127131
)
128132
self.assertIsNone(
129133
numeric_value_invalid_literal, 'Invalid string literal value is {}'.format(numeric_value_invalid_literal),
130134
)
131135

132136
numeric_value_overflow = event_tag_utils.get_numeric_value(
133-
{'value': sys.float_info.max * 10}, logger=logger.SimpleLogger()
137+
{'value': sys.float_info.max * 10}, self.logger
134138
)
135139
self.assertIsNone(
136140
numeric_value_overflow, 'Max numeric value is {}'.format(numeric_value_overflow),
137141
)
138142

139-
numeric_value_inf = event_tag_utils.get_numeric_value({'value': float('inf')}, logger=logger.SimpleLogger())
143+
numeric_value_inf = event_tag_utils.get_numeric_value({'value': float('inf')}, self.logger)
140144
self.assertIsNone(numeric_value_inf, 'Infinity numeric value is {}'.format(numeric_value_inf))
141145

142146
numeric_value_neg_inf = event_tag_utils.get_numeric_value(
143-
{'value': float('-inf')}, logger=logger.SimpleLogger()
147+
{'value': float('-inf')}, self.logger
144148
)
145149
self.assertIsNone(
146150
numeric_value_neg_inf, 'Negative infinity numeric value is {}'.format(numeric_value_neg_inf),
147151
)
148152

149153
self.assertEqual(
150-
0.0, event_tag_utils.get_numeric_value({'value': 0.0}, logger=logger.SimpleLogger()),
154+
0.0, event_tag_utils.get_numeric_value({'value': 0.0}, self.logger),
151155
)

tests/test_event_processor.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def __eq__(self, other):
4646
return self.__dict__ == other.__dict__
4747

4848

49-
class TestEventDispatcher(object):
49+
class CustomEventDispatcher(object):
5050

5151
IMPRESSION_EVENT_NAME = 'campaign_activated'
5252

@@ -146,7 +146,7 @@ def _set_event_processor(self, event_dispatcher, logger):
146146
)
147147

148148
def test_drain_on_stop(self):
149-
event_dispatcher = TestEventDispatcher()
149+
event_dispatcher = CustomEventDispatcher()
150150

151151
with mock.patch.object(self.optimizely, 'logger') as mock_config_logging:
152152
self._set_event_processor(event_dispatcher, mock_config_logging)
@@ -161,7 +161,7 @@ def test_drain_on_stop(self):
161161
self.assertEqual(0, self.event_processor.event_queue.qsize())
162162

163163
def test_flush_on_max_timeout(self):
164-
event_dispatcher = TestEventDispatcher()
164+
event_dispatcher = CustomEventDispatcher()
165165

166166
with mock.patch.object(self.optimizely, 'logger') as mock_config_logging:
167167
self._set_event_processor(event_dispatcher, mock_config_logging)
@@ -176,7 +176,7 @@ def test_flush_on_max_timeout(self):
176176
self.assertEqual(0, self.event_processor.event_queue.qsize())
177177

178178
def test_flush_once_max_timeout(self):
179-
event_dispatcher = TestEventDispatcher()
179+
event_dispatcher = CustomEventDispatcher()
180180

181181
self.optimizely.logger = NoOpLogger()
182182

@@ -199,7 +199,7 @@ def test_flush_once_max_timeout(self):
199199
self.optimizely.logger = NoOpLogger()
200200

201201
def test_flush_max_batch_size(self):
202-
event_dispatcher = TestEventDispatcher()
202+
event_dispatcher = CustomEventDispatcher()
203203

204204
with mock.patch.object(self.optimizely, 'logger') as mock_config_logging:
205205
self._set_event_processor(event_dispatcher, mock_config_logging)
@@ -215,7 +215,7 @@ def test_flush_max_batch_size(self):
215215
self.assertEqual(0, self.event_processor.event_queue.qsize())
216216

217217
def test_flush(self):
218-
event_dispatcher = TestEventDispatcher()
218+
event_dispatcher = CustomEventDispatcher()
219219

220220
with mock.patch.object(self.optimizely, 'logger') as mock_config_logging:
221221
self._set_event_processor(event_dispatcher, mock_config_logging)
@@ -235,7 +235,7 @@ def test_flush(self):
235235
self.assertEqual(0, self.event_processor.event_queue.qsize())
236236

237237
def test_flush_on_mismatch_revision(self):
238-
event_dispatcher = TestEventDispatcher()
238+
event_dispatcher = CustomEventDispatcher()
239239

240240
with mock.patch.object(self.optimizely, 'logger') as mock_config_logging:
241241
self._set_event_processor(event_dispatcher, mock_config_logging)
@@ -260,7 +260,7 @@ def test_flush_on_mismatch_revision(self):
260260
self.assertEqual(0, self.event_processor.event_queue.qsize())
261261

262262
def test_flush_on_mismatch_project_id(self):
263-
event_dispatcher = TestEventDispatcher()
263+
event_dispatcher = CustomEventDispatcher()
264264

265265
with mock.patch.object(self.optimizely, 'logger') as mock_config_logging:
266266
self._set_event_processor(event_dispatcher, mock_config_logging)
@@ -285,7 +285,7 @@ def test_flush_on_mismatch_project_id(self):
285285
self.assertEqual(0, self.event_processor.event_queue.qsize())
286286

287287
def test_stop_and_start(self):
288-
event_dispatcher = TestEventDispatcher()
288+
event_dispatcher = CustomEventDispatcher()
289289

290290
with mock.patch.object(self.optimizely, 'logger') as mock_config_logging:
291291
self._set_event_processor(event_dispatcher, mock_config_logging)
@@ -311,7 +311,7 @@ def test_stop_and_start(self):
311311
self.assertEqual(0, self.event_processor.event_queue.qsize())
312312

313313
def test_init__invalid_batch_size(self):
314-
event_dispatcher = TestEventDispatcher()
314+
event_dispatcher = CustomEventDispatcher()
315315

316316
with mock.patch.object(self.optimizely, 'logger') as mock_config_logging:
317317
self.event_processor = BatchEventProcessor(
@@ -329,7 +329,7 @@ def test_init__invalid_batch_size(self):
329329
mock_config_logging.info.assert_called_with('Using default value 10 for batch_size.')
330330

331331
def test_init__NaN_batch_size(self):
332-
event_dispatcher = TestEventDispatcher()
332+
event_dispatcher = CustomEventDispatcher()
333333

334334
with mock.patch.object(self.optimizely, 'logger') as mock_config_logging:
335335
self.event_processor = BatchEventProcessor(
@@ -347,7 +347,7 @@ def test_init__NaN_batch_size(self):
347347
mock_config_logging.info.assert_called_with('Using default value 10 for batch_size.')
348348

349349
def test_init__invalid_flush_interval(self):
350-
event_dispatcher = TestEventDispatcher()
350+
event_dispatcher = CustomEventDispatcher()
351351

352352
with mock.patch.object(self.optimizely, 'logger') as mock_config_logging:
353353
self.event_processor = BatchEventProcessor(
@@ -365,7 +365,7 @@ def test_init__invalid_flush_interval(self):
365365
mock_config_logging.info.assert_called_with('Using default value 30 for flush_interval.')
366366

367367
def test_init__float_flush_interval(self):
368-
event_dispatcher = TestEventDispatcher()
368+
event_dispatcher = CustomEventDispatcher()
369369

370370
with mock.patch.object(self.optimizely, 'logger') as mock_config_logging:
371371
self.event_processor = BatchEventProcessor(
@@ -382,7 +382,7 @@ def test_init__float_flush_interval(self):
382382
self.assertEqual(datetime.timedelta(seconds=0.5), self.event_processor.flush_interval)
383383

384384
def test_init__float_flush_deadline(self):
385-
event_dispatcher = TestEventDispatcher()
385+
event_dispatcher = CustomEventDispatcher()
386386

387387
with mock.patch.object(self.optimizely, 'logger') as mock_config_logging:
388388
self.event_processor = BatchEventProcessor(
@@ -399,7 +399,7 @@ def test_init__float_flush_deadline(self):
399399
self.assertTrue(isinstance(self.event_processor.flushing_interval_deadline, float))
400400

401401
def test_init__bool_flush_interval(self):
402-
event_dispatcher = TestEventDispatcher()
402+
event_dispatcher = CustomEventDispatcher()
403403

404404
with mock.patch.object(self.optimizely, 'logger') as mock_config_logging:
405405
self.event_processor = BatchEventProcessor(
@@ -417,7 +417,7 @@ def test_init__bool_flush_interval(self):
417417
mock_config_logging.info.assert_called_with('Using default value 30 for flush_interval.')
418418

419419
def test_init__string_flush_interval(self):
420-
event_dispatcher = TestEventDispatcher()
420+
event_dispatcher = CustomEventDispatcher()
421421

422422
with mock.patch.object(self.optimizely, 'logger') as mock_config_logging:
423423
self.event_processor = BatchEventProcessor(
@@ -435,7 +435,7 @@ def test_init__string_flush_interval(self):
435435
mock_config_logging.info.assert_called_with('Using default value 30 for flush_interval.')
436436

437437
def test_init__invalid_timeout_interval(self):
438-
event_dispatcher = TestEventDispatcher()
438+
event_dispatcher = CustomEventDispatcher()
439439

440440
with mock.patch.object(self.optimizely, 'logger') as mock_config_logging:
441441
self.event_processor = BatchEventProcessor(
@@ -453,7 +453,7 @@ def test_init__invalid_timeout_interval(self):
453453
mock_config_logging.info.assert_called_with('Using default value 5 for timeout_interval.')
454454

455455
def test_init__NaN_timeout_interval(self):
456-
event_dispatcher = TestEventDispatcher()
456+
event_dispatcher = CustomEventDispatcher()
457457

458458
with mock.patch.object(self.optimizely, 'logger') as mock_config_logging:
459459
self.event_processor = BatchEventProcessor(
@@ -495,7 +495,7 @@ def on_log_event(log_event):
495495
)
496496

497497

498-
class TestForwardingEventDispatcher(object):
498+
class CustomForwardingEventDispatcher(object):
499499
def __init__(self, is_updated=False):
500500
self.is_updated = is_updated
501501

@@ -512,7 +512,7 @@ def setUp(self, *args, **kwargs):
512512
self.event_name = 'test_event'
513513
self.optimizely.logger = NoOpLogger()
514514
self.notification_center = self.optimizely.notification_center
515-
self.event_dispatcher = TestForwardingEventDispatcher(is_updated=False)
515+
self.event_dispatcher = CustomForwardingEventDispatcher(is_updated=False)
516516

517517
with mock.patch.object(self.optimizely, 'logger') as mock_config_logging:
518518
self.event_processor = ForwardingEventProcessor(

0 commit comments

Comments
 (0)