Fix tests

Author: audiodude

wp1/logic/builder_test.py

@@ -1266,129 +1266,6 @@ def test_handle_zim_generation_create_new_schedule(
 
         self.assertEqual(b"1234-a", result)
 
-    @patch("wp1.logic.builder.zimfarm.is_zim_file_ready")
-    @patch("wp1.logic.builder.wp10_connect")
-    @patch("wp1.logic.builder.redis_connect")
-    @patch(
-        "wp1.logic.selection.utcnow",
-        return_value=datetime.datetime(2022, 12, 25, 0, 1, 2),
-    )
-    def test_on_zim_file_status_poll_file_ready(
-        self, mock_utcnow, mock_redis, mock_connect, mock_is_ready
-    ):
-        mock_is_ready.return_value = "FILE_READY"
-        builder_id = self._insert_builder(zim_version=1)
-        self._insert_selection(
-            1,
-            "text/tab-separated-values",
-            version=1,
-            builder_id=builder_id,
-            has_errors=False,
-            zim_file_ready=True,
-        )
-        self._insert_selection(
-            2,
-            "text/tab-separated-values",
-            version=2,
-            builder_id=builder_id,
-            has_errors=False,
-            zim_task_id="9abc",
-            zim_file_ready=False,
-        )
-
-        orig_close = self.wp10db.close
-        try:
-            self.wp10db.close = lambda: True
-            mock_connect.return_value = self.wp10db
-            logic_builder.on_zim_file_status_poll("9abc")
-        finally:
-            self.wp10db.close = orig_close
-
-        with self.wp10db.cursor() as cursor:
-            cursor.execute(
-                "SELECT z_status, z_updated_at "
-                "FROM zim_tasks WHERE z_selection_id = 2"
-            )
-            data = cursor.fetchone()
-
-        self.assertIsNotNone(data)
-        self.assertEqual(b"FILE_READY", data["z_status"])
-        self.assertEqual(b"20221225000102", data["z_updated_at"])
-
-        with self.wp10db.cursor() as cursor:
-            cursor.execute(
-                "SELECT b.b_selection_zim_version FROM builders b " "WHERE b.b_id = %s",
-                (builder_id,),
-            )
-            zim_version = cursor.fetchone()["b_selection_zim_version"]
-
-        self.assertEqual(2, zim_version)
-
-    @patch(
-        "wp1.logic.builder.utcnow", return_value=datetime.datetime(2023, 1, 1, 5, 5, 5)
-    )
-    @patch("wp1.logic.builder.zimfarm.is_zim_file_ready")
-    @patch("wp1.logic.builder.wp10_connect")
-    @patch("wp1.logic.builder.redis_connect")
-    def test_on_zim_file_status_poll_expired(
-        self, mock_redis, mock_connect, mock_is_ready, mock_utcnow
-    ):
-        mock_is_ready.return_value = "REQUESTED"
-        builder_id = self._insert_builder()
-        self._insert_selection(
-            1, "text/tab-separated-values", builder_id=builder_id, has_errors=False
-        )
-
-        orig_close = self.wp10db.close
-        try:
-            self.wp10db.close = lambda: True
-            mock_connect.return_value = self.wp10db
-            logic_builder.on_zim_file_status_poll("5678")
-        finally:
-            self.wp10db.close = orig_close
-
-        with self.wp10db.cursor() as cursor:
-            cursor.execute(
-                "SELECT z_status, z_updated_at "
-                "FROM zim_tasks WHERE z_selection_id = 1"
-            )
-            data = cursor.fetchone()
-
-        self.assertIsNotNone(data)
-        self.assertEqual(b"FAILED", data["z_status"])
-        self.assertIsNone(data["z_updated_at"])
-
-    @patch("wp1.logic.builder.zimfarm.is_zim_file_ready")
-    @patch("wp1.logic.builder.wp10_connect")
-    @patch("wp1.logic.builder.redis_connect")
-    def test_on_zim_file_status_poll_failed(
-        self, mock_redis, mock_connect, mock_is_ready
-    ):
-        mock_is_ready.return_value = "FAILED"
-        builder_id = self._insert_builder()
-        self._insert_selection(
-            1, "text/tab-separated-values", builder_id=builder_id, has_errors=False
-        )
-
-        orig_close = self.wp10db.close
-        try:
-            self.wp10db.close = lambda: True
-            mock_connect.return_value = self.wp10db
-            logic_builder.on_zim_file_status_poll("5678")
-        finally:
-            self.wp10db.close = orig_close
-
-        with self.wp10db.cursor() as cursor:
-            cursor.execute(
-                "SELECT z_status, z_updated_at "
-                "FROM zim_tasks WHERE z_selection_id = 1"
-            )
-            data = cursor.fetchone()
-
-        self.assertIsNotNone(data)
-        self.assertEqual(b"FAILED", data["z_status"])
-        self.assertIsNone(data["z_updated_at"])
-
     def test_update_version_for_finished_zim(self):
         builder_id = self._insert_builder(zim_version=1)
         self._insert_selection(

wp1/web/builders.py

@@ -340,6 +340,8 @@ def update_zimfarm_status():
                 emails.respond_to_zim_task_completed(wp10db, zim_task, zim_schedule)
             return "", 204
 
+    return "", 204
+
 
 @builders.route("/<builder_id>/zim/latest")
 def latest_zim_file_for_builder(builder_id):