diff --git a/ara/api/urls.py b/ara/api/urls.py index 8389b653..b12f1633 100644 --- a/ara/api/urls.py +++ b/ara/api/urls.py @@ -20,13 +20,13 @@ from rest_framework.routers import DefaultRouter from ara.api import views router = DefaultRouter(trailing_slash=False) -router.register("labels", views.LabelViewSet, base_name="label") -router.register("playbooks", views.PlaybookViewSet, base_name="playbook") -router.register("plays", views.PlayViewSet, base_name="play") -router.register("tasks", views.TaskViewSet, base_name="task") -router.register("hosts", views.HostViewSet, base_name="host") -router.register("results", views.ResultViewSet, base_name="result") -router.register("files", views.FileViewSet, base_name="file") -router.register("records", views.RecordViewSet, base_name="record") +router.register("labels", views.LabelViewSet, basename="label") +router.register("playbooks", views.PlaybookViewSet, basename="playbook") +router.register("plays", views.PlayViewSet, basename="play") +router.register("tasks", views.TaskViewSet, basename="task") +router.register("hosts", views.HostViewSet, basename="host") +router.register("results", views.ResultViewSet, basename="result") +router.register("files", views.FileViewSet, basename="file") +router.register("records", views.RecordViewSet, basename="record") urlpatterns = router.urls diff --git a/tests/with_mysql.yaml b/tests/with_mysql.yaml index bb5eed60..e06662f4 100644 --- a/tests/with_mysql.yaml +++ b/tests/with_mysql.yaml @@ -63,7 +63,7 @@ {{ _mysql_image_name }} when: - _docker_run is failed - - "'Failed to import docker or docker-py' in _docker_run.msg" + - "'Failed to import docker or docker-py' in _docker_run.msg or 'Failed to import the required Python library' in _docker_run.msg" tasks: - block: - name: Set up the API with the ara_api role diff --git a/tests/with_postgresql.yaml b/tests/with_postgresql.yaml index 7aae5767..3d9dc240 100644 --- a/tests/with_postgresql.yaml +++ b/tests/with_postgresql.yaml @@ -59,7 +59,7 @@ postgres:10 when: - _docker_run is failed - - "'Failed to import docker or docker-py' in _docker_run.msg" + - "'Failed to import docker or docker-py' in _docker_run.msg or 'Failed to import the required Python library' in _docker_run.msg" tasks: - block: - name: Set up the API with the ara_api role