CSI-5774: UT for new error code

Signed-off-by: Shlomit Neufeld <[email protected]>
IBM · Jan 12, 2025 · 4f9cd44 · 4f9cd44
1 parent 127df08
commit 4f9cd44
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/Dockerfile-controllers.test b/Dockerfile-controllers.test
@@ -30,6 +30,7 @@ RUN pip3 install -r ./csi_requirements.txt -r ./host_definer_requirements.txt
 
 USER root
 COPY controllers/scripts/csi_general .
+RUN chmod +x csi_pb2.sh
 RUN ./csi_pb2.sh
 RUN pip3 install .
 

diff --git a/controllers/tests/array_action/abstract/test_array_mediator_abstract.py b/controllers/tests/array_action/abstract/test_array_mediator_abstract.py
@@ -212,6 +212,9 @@ def test_unmap_volume_by_initiators_unmap_volume_object_not_found_error(self):
     def test_unmap_volume_by_initiators_unmap_volume_volume_already_unmapped_error(self):
         self._test_unpublish_volume_unmap_volume_with_error(array_errors.VolumeAlreadyUnmappedError(''))
 
+    def test_unmap_volume_by_initiators_unmap_volume_volume_not_mapped_to_host_error(self):
+        self._test_unpublish_volume_unmap_volume_with_error(array_errors.VolumeNotMappedToHostError('volume', 'host'))
+
     def test_unmap_volume_by_initiators_unmap_volume_permission_denied_error(self):
         self._test_unpublish_volume_unmap_volume_with_error(array_errors.PermissionDeniedError(''))
 

diff --git a/controllers/tests/array_action/svc/array_mediator_svc_test.py b/controllers/tests/array_action/svc/array_mediator_svc_test.py
@@ -1828,6 +1828,8 @@ def test_unmap_volume_rmvdiskhostmap_errors(self):
                                                      array_errors.HostNotFoundError)
         self._test_unmap_volume_rmvdiskhostmap_error(svc_errors.CommandExecutionError("CMMVC5842E"),
                                                      array_errors.VolumeAlreadyUnmappedError)
+        self._test_unmap_volume_rmvdiskhostmap_error(svc_errors.CommandExecutionError("CMMVC5804E"),
+                                                     array_errors.VolumeNotMappedToHostError)
         self._test_unmap_volume_rmvdiskhostmap_error(svc_errors.CommandExecutionError(
             array_settings.DUMMY_ERROR_MESSAGE),
             array_errors.UnmappingError)

diff --git a/controllers/tests/controller_server/csi_controller_server_test.py b/controllers/tests/controller_server/csi_controller_server_test.py
@@ -1205,6 +1205,10 @@ def test_unpublish_volume_unmap_volume_by_initiators_volume_already_unmapped_err
         self._test_unpublish_volume_unmap_volume_by_initiators_with_error(array_errors.VolumeAlreadyUnmappedError(""),
                                                                           grpc.StatusCode.OK)
 
+    def test_unpublish_volume_unmap_volume_by_initiators_volume_not_mapped_to_host_error(self):
+        self._test_unpublish_volume_unmap_volume_by_initiators_with_error(array_errors.VolumeNotMappedToHostError("volume", "host"),
+                                                                          grpc.StatusCode.OK)
+
     def test_unpublish_volume_unmap_volume_by_initiators_permission_denied_error(self):
         self._test_unpublish_volume_unmap_volume_by_initiators_with_error(array_errors.PermissionDeniedError("msg"),
                                                                           grpc.StatusCode.PERMISSION_DENIED)

diff --git a/scripts/run_unitests.sh b/scripts/run_unitests.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 set -x
 [ -n "$1" ] && coverage="-v $1:/driver/coverage:z"
-docker build -f Dockerfile-controllers.test -t csi-controller-tests . && \
-docker run --entrypoint ./controllers/scripts/unitests.sh --rm -t $coverage csi-controller-tests
+podman build -f Dockerfile-controllers.test -t csi-controller-tests . && \
+podman run --entrypoint ./controllers/scripts/unitests.sh --rm -t $coverage csi-controller-tests