Skip to content

Commit b2eb96c

Browse files
committed
Trying to fix test
1 parent 153e8f9 commit b2eb96c

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

tests/test_config_manager.py

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,16 @@ def test_get_config(self):
159159
# Assert that config is set.
160160
self.assertIsInstance(project_config_manager.get_config(), project_config.ProjectConfig)
161161

162+
def test_get_config_blocks(self):
163+
""" Test that get_config blocks until blocking timeout is hit. """
164+
start_time = time.time()
165+
project_config_manager = config_manager.PollingConfigManager(sdk_key='sdk_key',
166+
blocking_timeout=5)
167+
# Assert get_config should block until blocking timeout.
168+
project_config_manager.get_config()
169+
end_time = time.time()
170+
self.assertEqual(5, round(end_time - start_time))
171+
162172

163173
@mock.patch('requests.get')
164174
class PollingConfigManagerTest(base.BaseTest):
@@ -217,7 +227,8 @@ def test_get_datafile_url__sdk_key_and_url_and_template_provided(self, _):
217227

218228
def test_set_update_interval(self, _):
219229
""" Test set_update_interval with different inputs. """
220-
project_config_manager = config_manager.PollingConfigManager(sdk_key='some_key')
230+
with mock.patch('optimizely.config_manager.PollingConfigManager.fetch_datafile'):
231+
project_config_manager = config_manager.PollingConfigManager(sdk_key='some_key')
221232

222233
# Assert that if invalid update_interval is set, then exception is raised.
223234
with self.assertRaisesRegexp(optimizely_exceptions.InvalidInputException,
@@ -238,7 +249,8 @@ def test_set_update_interval(self, _):
238249

239250
def test_set_blocking_timeout(self, _):
240251
""" Test set_blocking_timeout with different inputs. """
241-
project_config_manager = config_manager.PollingConfigManager(sdk_key='some_key')
252+
with mock.patch('optimizely.config_manager.PollingConfigManager.fetch_datafile'):
253+
project_config_manager = config_manager.PollingConfigManager(sdk_key='some_key')
242254

243255
# Assert that if invalid blocking_timeout is set, then exception is raised.
244256
with self.assertRaisesRegexp(optimizely_exceptions.InvalidInputException,
@@ -261,16 +273,10 @@ def test_set_blocking_timeout(self, _):
261273
project_config_manager.set_blocking_timeout(5)
262274
self.assertEqual(5, project_config_manager.blocking_timeout)
263275

264-
# Assert get_config should block until blocking timeout.
265-
project_config_manager._config_ready_event.clear()
266-
start_time = time.time()
267-
project_config_manager.get_config()
268-
end_time = time.time()
269-
self.assertEqual(5, round(end_time - start_time))
270-
271276
def test_set_last_modified(self, _):
272277
""" Test that set_last_modified sets last_modified field based on header. """
273-
project_config_manager = config_manager.PollingConfigManager(sdk_key='some_key')
278+
with mock.patch('optimizely.config_manager.PollingConfigManager.fetch_datafile'):
279+
project_config_manager = config_manager.PollingConfigManager(sdk_key='some_key')
274280

275281
last_modified_time = 'Test Last Modified Time'
276282
test_response_headers = {

0 commit comments

Comments
 (0)