Test: fix tests to check for None first

Author: humitos

readthedocs/api/v2/views/integrations.py

@@ -431,7 +431,7 @@ def handle_webhook(self):
                 (created or deleted),
         ]):
             integration = self.get_integration()
-            events = integration.provider_data.get('events', [])
+            events = integration.provider_data.get('events', []) if integration.provider_data else []  # noqa
             if any([
                     GITHUB_CREATE in events,
                     GITHUB_DELETE in events,

readthedocs/builds/models.py

@@ -738,7 +738,7 @@ def config(self):
         # probably change this field to be a ForeignKey to avoid repeating the
         # config file over and over again and re-use them to save db data as
         # well
-        if self.CONFIG_KEY in self._config:
+        if self._config and self.CONFIG_KEY in self._config:
             return (
                 Build.objects
                 .only('_config')
@@ -951,7 +951,9 @@ def external_version_name(self):
         return None
 
     def using_latest_config(self):
-        return int(self.config.get('version', '1')) == LATEST_CONFIGURATION_VERSION
+        if self.config:
+            return int(self.config.get('version', '1')) == LATEST_CONFIGURATION_VERSION
+        return False
 
     def reset(self):
         """

readthedocs/builds/tasks.py

@@ -115,14 +115,17 @@ def route_for_task(self, task, args, kwargs, **__):
         last_builds = version.builds.order_by('-date')[:self.N_LAST_BUILDS]
         # Version has used conda in previous builds
         for build in last_builds.iterator():
-            build_tools_python = (
-                build.config
-                .get('build', {})
-                .get('tools', {})
-                .get('python', {})
-                .get('version', '')
-            )
-            conda = build.config.get('conda', None)
+            build_tools_python = ''
+            conda = None
+            if build.config:
+                build_tools_python = (
+                    build.config
+                    .get('build', {})
+                    .get('tools', {})
+                    .get('python', {})
+                    .get('version', '')
+                )
+                conda = build.config.get('conda', None)
 
             uses_conda = any([
                 conda,

readthedocs/rtd_tests/tests/test_api.py

@@ -89,7 +89,7 @@ def test_make_build(self):
         self.assertEqual(resp.status_code, status.HTTP_201_CREATED)
         build = resp.data
         self.assertEqual(build['state_display'], 'Cloning')
-        self.assertEqual(build['config'], {})
+        self.assertIsNone(build['config'])
 
         resp = client.get('/api/v2/build/%s/' % build['id'])
         self.assertEqual(resp.status_code, 200)