Merge branch 'master' into mnoman/rmMDspellcheck

Author: aliabbasrizvi

.travis.yml

@@ -19,6 +19,7 @@ stages:
   - 'Linting'
   - 'Integration tests'
   - 'Test'
+  - 'Source Clear'
 
 jobs:
   include:
@@ -51,12 +52,18 @@ jobs:
         - $HOME/travisci-tools/trigger-script-with-status-update.sh
       after_success: travis_terminate 0
     - stage: 'Test'
-      addons:
-        srcclr: true
       dist: xenial
       python: "3.7"
     - stage: 'Test'
-      addons:
-        srcclr: true
       dist: xenial
       python: "3.8"
+
+    - stage: 'Source Clear'
+      if: type = cron
+      addons:
+        srcclr: true
+      before_install: skip
+      install: skip
+      before_script: skip
+      script: skip
+      after_success: skip

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Optimizely Python SDK Changelog
 
+## 3.5.1
+July 10th, 2020
+
+### Bug Fixes:
+* Fixed HTTP request exception handling in `PollingConfigManager`. ([#285](https://github.com/optimizely/python-sdk/pull/285))
+
 ## 3.5.0
 July 9th, 2020
 

optimizely/config_manager.py

@@ -325,7 +325,7 @@ def _handle_response(self, response):
         """
         try:
             response.raise_for_status()
-        except requests_exceptions.HTTPError as err:
+        except requests_exceptions.RequestException as err:
             self.logger.error('Fetching datafile from {} failed. Error: {}'.format(self.datafile_url, str(err)))
             return
 

optimizely/version.py

@@ -11,5 +11,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version_info = (3, 5, 0)
+version_info = (3, 5, 1)
 __version__ = '.'.join(str(v) for v in version_info)

tests/test_config_manager.py

@@ -392,6 +392,47 @@ def test_fetch_datafile(self, _):
         )
         self.assertEqual(test_headers['Last-Modified'], project_config_manager.last_modified)
         self.assertIsInstance(project_config_manager.get_config(), project_config.ProjectConfig)
+        self.assertTrue(project_config_manager.is_running)
+
+    def test_fetch_datafile__exception_raised(self, _):
+        """ Test that config_manager keeps running if exception is raised when fetching datafile. """
+        class MockExceptionResponse(object):
+            def raise_for_status(self):
+                raise requests.exceptions.RequestException('Error Error !!')
+
+        sdk_key = 'some_key'
+        mock_logger = mock.Mock()
+        with mock.patch('optimizely.config_manager.PollingConfigManager.fetch_datafile'):
+            project_config_manager = config_manager.PollingConfigManager(sdk_key=sdk_key, logger=mock_logger)
+        expected_datafile_url = enums.ConfigManager.DATAFILE_URL_TEMPLATE.format(sdk_key=sdk_key)
+        test_headers = {'Last-Modified': 'New Time'}
+        test_datafile = json.dumps(self.config_dict_with_features)
+        test_response = requests.Response()
+        test_response.status_code = 200
+        test_response.headers = test_headers
+        test_response._content = test_datafile
+        with mock.patch('requests.get', return_value=test_response):
+            project_config_manager.fetch_datafile()
+
+        self.assertEqual(test_headers['Last-Modified'], project_config_manager.last_modified)
+        self.assertIsInstance(project_config_manager.get_config(), project_config.ProjectConfig)
+
+        # Call fetch_datafile again, but raise exception this time
+        with mock.patch('requests.get', return_value=MockExceptionResponse()) as mock_requests:
+            project_config_manager.fetch_datafile()
+
+        mock_requests.assert_called_once_with(
+            expected_datafile_url,
+            headers={'If-Modified-Since': test_headers['Last-Modified']},
+            timeout=enums.ConfigManager.REQUEST_TIMEOUT,
+        )
+        mock_logger.error.assert_called_once_with('Fetching datafile from {} failed. Error: Error Error !!'.format(
+            expected_datafile_url
+        ))
+        self.assertEqual(test_headers['Last-Modified'], project_config_manager.last_modified)
+        self.assertIsInstance(project_config_manager.get_config(), project_config.ProjectConfig)
+        # Confirm that config manager keeps running
+        self.assertTrue(project_config_manager.is_running)
 
     def test_is_running(self, _):
         """ Test that polling thread is running after instance of PollingConfigManager is created. """