Fix tests

Author: stsewd

readthedocs/rtd_tests/tests/test_celery.py

@@ -3,19 +3,23 @@
 from os.path import exists
 from tempfile import mkdtemp
 
+from allauth.socialaccount.models import SocialAccount
 from django.contrib.auth.models import User
 from django_dynamic_fixture import get
 from messages_extends.models import Message
 from mock import MagicMock, patch
 
-from allauth.socialaccount.models import SocialAccount
-
-from readthedocs.builds.constants import LATEST, BUILD_STATUS_SUCCESS, EXTERNAL
-from readthedocs.builds.models import Build
+from readthedocs.builds.constants import (
+    BUILD_STATE_TRIGGERED,
+    BUILD_STATUS_SUCCESS,
+    EXTERNAL,
+    LATEST,
+)
+from readthedocs.builds.models import Build, Version
+from readthedocs.doc_builder.environments import LocalBuildEnvironment
 from readthedocs.doc_builder.exceptions import VersionLockedError
-from readthedocs.projects import tasks
-from readthedocs.builds.models import Version
 from readthedocs.oauth.models import RemoteRepository
+from readthedocs.projects import tasks
 from readthedocs.projects.exceptions import RepositoryError
 from readthedocs.projects.models import Project
 from readthedocs.rtd_tests.base import RTDTestCase
@@ -51,6 +55,22 @@ def setUp(self):
         )
         self.project.users.add(self.eric)
 
+    def get_update_docs_task(self, version):
+        build_env = LocalBuildEnvironment(
+            version.project, version, record=False,
+        )
+
+        update_docs = tasks.UpdateDocsTaskStep(
+            build_env=build_env,
+            project=version.project,
+            version=version,
+            build={
+                'id': 99,
+                'state': BUILD_STATE_TRIGGERED,
+            },
+        )
+        return update_docs
+
     def tearDown(self):
         shutil.rmtree(self.repo)
         super().tearDown()
@@ -236,18 +256,16 @@ def test_check_duplicate_reserved_version_latest(self, checkout_path, api_v2):
         checkout_path.return_value = local_repo
 
         version = self.project.versions.get(slug=LATEST)
-        sync_repository = tasks.UpdateDocsTaskStep()
-        sync_repository.version = version
-        sync_repository.project = self.project
+        sync_repository = self.get_update_docs_task(version)
         with self.assertRaises(RepositoryError) as e:
-            sync_repository.sync_repo()
+            sync_repository.sync_repo(sync_repository.build_env)
         self.assertEqual(
             str(e.exception),
             RepositoryError.DUPLICATED_RESERVED_VERSIONS,
         )
 
         delete_git_branch(self.repo, 'latest')
-        sync_repository.sync_repo()
+        sync_repository.sync_repo(sync_repository.build_env)
         api_v2.project().sync_versions.post.assert_called()
 
     @patch('readthedocs.projects.tasks.api_v2')
@@ -262,11 +280,9 @@ def test_check_duplicate_reserved_version_stable(self, checkout_path, api_v2):
         checkout_path.return_value = local_repo
 
         version = self.project.versions.get(slug=LATEST)
-        sync_repository = tasks.UpdateDocsTaskStep()
-        sync_repository.version = version
-        sync_repository.project = self.project
+        sync_repository = self.get_update_docs_task(version)
         with self.assertRaises(RepositoryError) as e:
-            sync_repository.sync_repo()
+            sync_repository.sync_repo(sync_repository.build_env)
         self.assertEqual(
             str(e.exception),
             RepositoryError.DUPLICATED_RESERVED_VERSIONS,
@@ -281,11 +297,10 @@ def test_check_duplicate_no_reserved_version(self, api_v2):
         create_git_tag(self.repo, 'no-reserved')
 
         version = self.project.versions.get(slug=LATEST)
-        sync_repository = tasks.UpdateDocsTaskStep()
-        sync_repository.version = version
-        sync_repository.project = self.project
-        sync_repository.sync_repo()
 
+        sync_repository = self.get_update_docs_task(version)
+
+        sync_repository.sync_repo(sync_repository.build_env)
         api_v2.project().sync_versions.post.assert_called()
 
     def test_public_task_exception(self):

readthedocs/rtd_tests/tests/test_config_integration.py

@@ -8,7 +8,7 @@
 from django_dynamic_fixture import get
 from mock import MagicMock, PropertyMock, patch
 
-from readthedocs.builds.constants import EXTERNAL, BUILD_STATE_TRIGGERED
+from readthedocs.builds.constants import BUILD_STATE_TRIGGERED, EXTERNAL
 from readthedocs.builds.models import Version
 from readthedocs.config import (
     ALL,
@@ -20,12 +20,12 @@
 from readthedocs.config.models import PythonInstallRequirements
 from readthedocs.config.tests.utils import apply_fs
 from readthedocs.doc_builder.config import load_yaml_config
+from readthedocs.doc_builder.constants import DOCKER_IMAGE_SETTINGS
 from readthedocs.doc_builder.environments import LocalBuildEnvironment
 from readthedocs.doc_builder.python_environments import Conda, Virtualenv
 from readthedocs.projects import tasks
 from readthedocs.projects.models import Project
 from readthedocs.rtd_tests.utils import create_git_submodule, make_git_repo
-from readthedocs.doc_builder.constants import DOCKER_IMAGE_SETTINGS
 
 
 def create_load(config=None):
@@ -1062,7 +1062,7 @@ def test_submodules_include(
 
         update_docs = self.get_update_docs_task()
         checkout_path.return_value = git_repo
-        update_docs.additional_vcs_operations()
+        update_docs.additional_vcs_operations(update_docs.build_env)
 
         args, kwargs = checkout_submodules.call_args
         assert set(args[0]) == set(expected)
@@ -1091,7 +1091,7 @@ def test_submodules_exclude(
 
         update_docs = self.get_update_docs_task()
         checkout_path.return_value = git_repo
-        update_docs.additional_vcs_operations()
+        update_docs.additional_vcs_operations(update_docs.build_env)
 
         args, kwargs = checkout_submodules.call_args
         assert set(args[0]) == {'two', 'three'}
@@ -1120,7 +1120,7 @@ def test_submodules_exclude_all(
 
         update_docs = self.get_update_docs_task()
         checkout_path.return_value = git_repo
-        update_docs.additional_vcs_operations()
+        update_docs.additional_vcs_operations(update_docs.build_env)
 
         checkout_submodules.assert_not_called()
 
@@ -1143,6 +1143,6 @@ def test_submodules_default_exclude_all(
 
         update_docs = self.get_update_docs_task()
         checkout_path.return_value = git_repo
-        update_docs.additional_vcs_operations()
+        update_docs.additional_vcs_operations(update_docs.build_env)
 
         checkout_submodules.assert_not_called()