Fix tests that decided to start failing

Author: agjohnson

readthedocs/rtd_tests/mocks/mock_api.py

@@ -77,13 +77,20 @@ def __init__(self, repo):
     def project(self, x):
         return ProjectData()
 
+    def build(self, x):
+        return mock.Mock(**{'get.return_value': {'state': 'triggered'}})
+
+    def command(self, x):
+        return mock.Mock(**{'get.return_value': {}})
+
 
 @contextmanager
 def mock_api(repo):
     api_mock = MockApi(repo)
-    with (
-            mock.patch('readthedocs.restapi.client.api', api_mock) and
-            mock.patch('readthedocs.api.client.api', api_mock) and
-            mock.patch('readthedocs.projects.tasks.api_v2', api_mock) and
-            mock.patch('readthedocs.projects.tasks.api_v1', api_mock)):
+    with mock.patch('readthedocs.restapi.client.api', api_mock), \
+            mock.patch('readthedocs.api.client.api', api_mock), \
+            mock.patch('readthedocs.projects.tasks.api_v2', api_mock), \
+            mock.patch('readthedocs.projects.tasks.api_v1', api_mock), \
+            mock.patch('readthedocs.doc_builder.environments.api_v1', api_mock), \
+            mock.patch('readthedocs.doc_builder.environments.api_v2', api_mock):
         yield api_mock

readthedocs/rtd_tests/tests/test_celery.py

@@ -5,8 +5,10 @@
 from tempfile import mkdtemp
 
 from django.contrib.auth.models import User
+from django_dynamic_fixture import get
 from mock import patch, MagicMock
 
+from readthedocs.builds.models import Build
 from readthedocs.projects.models import Project
 from readthedocs.projects import tasks
 
@@ -66,10 +68,14 @@ def test_clear_artifacts(self):
     @patch('readthedocs.projects.tasks.UpdateDocsTask.setup_vcs',
            new=MagicMock)
     def test_update_docs(self):
-        with mock_api(self.repo):
-            update_docs = tasks.UpdateDocsTask()
-            result = update_docs.delay(self.project.pk, record=False,
-                                       intersphinx=False)
+        build = get(Build, project=self.project,
+                    version=self.project.versions.first())
+        with mock_api(self.repo) as mapi:
+            result = tasks.update_docs.delay(
+                self.project.pk,
+                build_pk=build.pk,
+                record=False,
+                intersphinx=False)
         self.assertTrue(result.successful())
 
     def test_update_imported_doc(self):