Reset more fields

Author: stsewd

readthedocs/api/v2/views/model_views.py

@@ -12,7 +12,7 @@
 from rest_framework.renderers import BaseRenderer, JSONRenderer
 from rest_framework.response import Response
 
-from readthedocs.builds.constants import INTERNAL
+from readthedocs.builds.constants import BUILD_STATE_FINISHED, INTERNAL
 from readthedocs.builds.models import Build, BuildCommandResult, Version
 from readthedocs.builds.tasks import sync_versions_task
 from readthedocs.oauth.models import RemoteOrganization, RemoteRepository
@@ -277,15 +277,21 @@ def retrieve(self, *args, **kwargs):
         permission_classes=[permissions.IsAdminUser],
         methods=['post'],
     )
-    def restart(self, request, **kwargs):
+    def reset(self, request, **kwargs):
         """
-        Restart the build so it can be re-used when re-trying.
+        Reset the build so it can be re-used when re-trying.
 
         Dates and states are usually overriden by the build,
         we care more about deleting the commands.
         """
         instance = self.get_object()
+        instance.state = BUILD_STATE_FINISHED
+        instance.status = ''
+        instance.success = True
         instance.output = ''
+        instance.error = ''
+        instance.exit_code = None
+        instance.builder = ''
         instance.cold_storage = False
         instance.commands.all().delete()
         instance.save()

readthedocs/projects/tasks.py

@@ -670,7 +670,7 @@ def run_setup(self, record=True):
 
         Return True if successful.
         """
-        api_v2.build(self.build['id']).restart.post()
+        api_v2.build(self.build['id']).reset.post()
 
         if settings.DOCKER_ENABLE:
             env_cls = DockerBuildEnvironment

readthedocs/rtd_tests/tests/test_api.py

@@ -37,7 +37,13 @@
     GitLabWebhookView,
 )
 from readthedocs.api.v2.views.task_views import get_status_data
-from readthedocs.builds.constants import EXTERNAL, LATEST
+from readthedocs.builds.constants import (
+    BUILD_STATE_CLONING,
+    BUILD_STATE_FINISHED,
+    BUILD_STATUS_DUPLICATED,
+    EXTERNAL,
+    LATEST,
+)
 from readthedocs.builds.models import Build, BuildCommandResult, Version
 from readthedocs.integrations.models import Integration
 from readthedocs.oauth.models import RemoteOrganization, RemoteRepository
@@ -87,11 +93,19 @@ def test_make_build(self):
         self.assertEqual(build['output'], 'Test Output')
         self.assertEqual(build['state_display'], 'Cloning')
 
-    def test_restart_build(self):
+    def test_reset_build(self):
         build = get(
             Build,
             project=self.project,
             version=self.version,
+            state=BUILD_STATE_CLONING,
+            status=BUILD_STATUS_DUPLICATED,
+            success=False,
+            output='Output',
+            error='Error',
+            exit_code=9,
+            builder='Builder',
+            cold_storage=True,
         )
         command = get(
             BuildCommandResult,
@@ -103,8 +117,20 @@ def test_restart_build(self):
 
         client = APIClient()
         client.force_login(self.user)
-        r = client.post(reverse('build-restart', args=(build.pk,)))
+        r = client.post(reverse('build-reset', args=(build.pk,)))
+
         self.assertEqual(r.status_code, 204)
+        build.refresh_from_db()
+        self.assertEqual(build.project, self.project)
+        self.assertEqual(build.version, self.version)
+        self.assertEqual(build.state, BUILD_STATE_FINISHED)
+        self.assertEqual(build.status, '')
+        self.assertTrue(build.success)
+        self.assertEqual(build.output, '')
+        self.assertEqual(build.error, '')
+        self.assertIsNone(build.exit_code)
+        self.assertEqual(build.builder, '')
+        self.assertFalse(build.cold_storage)
         self.assertEqual(build.commands.count(), 0)
 
 

readthedocs/rtd_tests/tests/test_privacy_urls.py

@@ -382,7 +382,7 @@ def setUp(self):
         }
         self.response_data = {
             'build-concurrent': {'status_code': 403},
-            'build-restart': {'status_code': 403},
+            'build-reset': {'status_code': 403},
             'project-sync-versions': {'status_code': 403},
             'project-token': {'status_code': 403},
             'emailhook-list': {'status_code': 403},