Merge #1768

1768: test: update python and grpc packages r=tiagolobocastro a=tiagolobocastro



Co-authored-by: Tiago Castro <[email protected]>

Author: mayastor-bors

scripts/pytest-tests.sh

@@ -106,15 +106,17 @@ while [ "$#" -gt 0 ]; do
       real_1="$(realpath $1 2>/dev/null)"
       real_2="$(realpath $SRCDIR/test/python/$1 2>/dev/null)"
       set -e
-      param="$1"
+      param=""
       if is_test "$real_1"; then
         param="$real_1"
       elif is_test "$real_2"; then
         param="$real_2"
       else
         TEST_ARGS="${TEST_ARGS:-}$1"
       fi
-      TEST_LIST="$TEST_LIST \n$param"
+      if [ "$param" != "" ]; then
+        TEST_LIST="${TEST_LIST:-}\n$param"
+      fi
       ;;
   esac
   shift

test/grpc/package-lock.json

@@ -17,8 +17,8 @@ def check_size(prev, current, delta):
 def containers(docker_project, function_scoped_container_getter):
     "Fixture to get handles to mayastor containers."
     containers = {}
-    for name in docker_project.service_names:
-        containers[name] = function_scoped_container_getter.get(name)
+    for container in docker_project.compose.ps():
+        containers[container.name] = container
     yield containers
 
 
@@ -28,7 +28,7 @@ def mayastors(docker_project, containers):
     handles = {}
     for name, container in containers.items():
         handles[name] = MayastorHandle(
-            container.get("NetworkSettings.Networks.mayastor_net.IPAddress")
+            container.network_settings.networks.get("mayastor_net").ip_address
         )
     yield handles
 
@@ -46,8 +46,8 @@ def create_temp_files(containers):
 def container_mod(docker_project, module_scoped_container_getter):
     "Fixture to get handles to mayastor containers."
     containers = {}
-    for name in docker_project.service_names:
-        containers[name] = module_scoped_container_getter.get(name)
+    for container in docker_project.compose.ps():
+        containers[container.name] = container
     yield containers
 
 
@@ -57,6 +57,6 @@ def mayastor_mod(docker_project, container_mod):
     handles = {}
     for name, container in container_mod.items():
         handles[name] = MayastorHandle(
-            container.get("NetworkSettings.Networks.mayastor_net.IPAddress")
+            container.network_settings.networks.get("mayastor_net").ip_address
         )
     yield handles

test/python/common/mayastor.py

@@ -1,16 +1,16 @@
 asyncio==3.4.3
-asyncssh==2.14.2
-black==24.3.0
-protobuf==4.21.8
-pytest==7.4.4
-pytest-asyncio==0.21.1
-pytest-bdd==6.1.1
+asyncssh==2.18.0
+black==24.10.0
+protobuf==5.28.3
+pytest==7.2.2
+pytest-asyncio==0.23.0
+pytest-bdd==7.3.0
 pytest-black==0.3.12
-pytest-docker-compose==3.2.1
+pytest-docker-compose-v2==0.1.1
 pytest-testconfig==0.2.0
-pytest-timeout==2.1.0
-pytest-variables==3.0.0
+pytest-timeout==2.3.1
+pytest-variables==3.1.0
 retrying==1.3.4
-requests==2.31.0
-docker==6.1.3
+requests==2.32.3
+docker==7.1.0
 pyyaml==5.3.1

test/python/local-job-fs-0-verify.state

@@ -17,8 +17,8 @@ def check_size(prev, current, delta):
 def containers(docker_project, function_scoped_container_getter):
     "Fixture to get handles to mayastor containers."
     containers = {}
-    for name in docker_project.service_names:
-        containers[name] = function_scoped_container_getter.get(name)
+    for container in docker_project.compose.ps():
+        containers[container.name] = container
     yield containers
 
 
@@ -28,7 +28,7 @@ def mayastors(docker_project, containers):
     handles = {}
     for name, container in containers.items():
         handles[name] = MayastorHandle(
-            container.get("NetworkSettings.Networks.mayastor_net.IPAddress")
+            container.network_settings.networks.get("mayastor_net").ip_address
         )
     yield handles
 
@@ -46,8 +46,8 @@ def create_temp_files(containers):
 def container_mod(docker_project, module_scoped_container_getter):
     "Fixture to get handles to mayastor containers."
     containers = {}
-    for name in docker_project.service_names:
-        containers[name] = module_scoped_container_getter.get(name)
+    for container in docker_project.compose.ps():
+        containers[container.name] = container
     yield containers
 
 
@@ -57,6 +57,6 @@ def mayastor_mod(docker_project, container_mod):
     handles = {}
     for name, container in container_mod.items():
         handles[name] = MayastorHandle(
-            container.get("NetworkSettings.Networks.mayastor_net.IPAddress")
+            container.network_settings.networks.get("mayastor_net").ip_address
         )
     yield handles