fix for new tasks::delete_route

flowspec/tasks.py

@@ -140,6 +140,7 @@ def delete_route(routepk, **kwargs):
     """For Route in ACTIVE state, deactivate it at first. Finally, delete the Route from the DB. Permissions must be checked before this call."""
     from flowspec.models import Route
     route = Route.objects.get(pk=routepk)
+    logger.info("tasks::delete_route(): initial route.status="+str(route.status))
     if route.status != "INACTIVE":
         logger.info("Deactivating active route...")
         # call deactivate_route() directly since we are already on background (celery task)
@@ -155,8 +156,9 @@ def delete_route(routepk, **kwargs):
             # Repeat due to error in deactivation
             route.status = "PENDING"
             route.save()
-            logger.error("Deactivation failed, repeat the deletion process.")
-            raise TimeoutError()
+            if True:
+              logger.error("Deactivation failed, repeat the deletion process.")
+              raise TimeoutError()
             
     if route.status == "INACTIVE":
         logger.info("Deleting inactive route...")

flowspec/test_viewsets.py

@@ -303,7 +303,7 @@ class TestRoute:
         response = api_client.delete(f"{endpoint}")
         print("route "+str(route_id)+" deleted")
         
-        assert response.status_code == 204
+        assert response.status_code == 202
 
         try:
             Route.objects.get(id=route_id)
@@ -367,7 +367,7 @@ class TestRouteOuter:
         print("response.content"+str(response.content))
     
         # Validate response headers and body contents, e.g. status code.
-        assert response.status_code == 201 or response.status_code == 204
+        assert response.status_code == 201 or response.status_code == 202
 
         resp_data = json.loads(response.content)
         print("myresp_data="+str(resp_data))
@@ -394,6 +394,6 @@ class TestRouteOuter:
  
         response = requests.delete(endpoint, headers=fod_api_headers)
 
-        assert response.status_code == 204
+        assert response.status_code == 202