From 8763ccd54634b8b314db137157ae8d4b33e72d35 Mon Sep 17 00:00:00 2001
From: Chris <chris.chien@suse.com>
Date: Thu, 26 Sep 2024 09:30:18 +0800
Subject: [PATCH] minor fix

---
 e2e/keywords/longhorn.resource    |  4 ++--
 e2e/libs/keywords/k8s_keywords.py | 10 +---------
 e2e/libs/utility/utility.py       |  2 +-
 e2e/requirements.txt              |  2 +-
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/e2e/keywords/longhorn.resource b/e2e/keywords/longhorn.resource
index e774eba5a..b181bec88 100644
--- a/e2e/keywords/longhorn.resource
+++ b/e2e/keywords/longhorn.resource
@@ -45,11 +45,11 @@ Check Longhorn workload pods ${condition} annotated with ${key}
     ...    ELSE IF    '${condition}' == 'is'    Should Be True    ${is_annotated}
     ...    ELSE    Fail    Invalid condition ${condition}
 
-Check instance-manager pod is not running on drained node    
+Check instance-manager pod is not running on drained node
     ${pod} =     get_instance_manager_on_node    ${drained_node}
     Should Be Equal    ${pod}    ${None}
 
-Check instance-manager pod is running on node ${node_id}    
+Check instance-manager pod is running on node ${node_id}
     ${node_name} =    get_node_by_index    ${node_id}
     ${pod} =     get_instance_manager_on_node    ${node_name}
     Should Not Be Equal    ${pod}    ${None}
\ No newline at end of file
diff --git a/e2e/libs/keywords/k8s_keywords.py b/e2e/libs/keywords/k8s_keywords.py
index a3eb6a312..ed5b0b7f8 100644
--- a/e2e/libs/keywords/k8s_keywords.py
+++ b/e2e/libs/keywords/k8s_keywords.py
@@ -7,10 +7,8 @@
 from k8s.k8s import wait_all_pods_evicted
 from k8s.k8s import get_all_pods_on_node
 from k8s.k8s import check_node_cordoned
-from k8s.k8s import check_drain_process_not_completed
 from k8s.k8s import get_instance_manager_on_node
 from k8s.k8s import check_instance_manager_pdb_not_exist
-from k8s.k8s import check_drain_process_completed
 from utility.utility import logging
 from node import Node
 
@@ -75,14 +73,8 @@ def get_all_pods_on_node(self, node_name):
     def check_node_cordoned(self, node_name):
         check_node_cordoned(node_name)
 
-    def check_drain_process_not_completed(self, drain_process):
-        return check_drain_process_not_completed(drain_process)
-
-    def check_drain_process_completed(self, drain_process):
-        return check_drain_process_completed(drain_process)
-
     def get_instance_manager_on_node(self, node_name):
         return get_instance_manager_on_node(node_name)
 
     def check_instance_manager_pdb_not_exist(self, instance_manager):
-        return check_instance_manager_pdb_not_exist(instance_manager)
\ No newline at end of file
+        return check_instance_manager_pdb_not_exist(instance_manager)
diff --git a/e2e/libs/utility/utility.py b/e2e/libs/utility/utility.py
index 1aa95847f..062deb92e 100644
--- a/e2e/libs/utility/utility.py
+++ b/e2e/libs/utility/utility.py
@@ -88,7 +88,7 @@ def subprocess_exec_cmd(cmd):
 
 def subprocess_exec_cmd_with_timeout(cmd, timeout):
     res = subprocess.check_output(cmd, timeout)
-    logging(f"Executed command {cmd} with result {res}")
+    logging(f"Executed command {cmd} with timeout {timeout}s, result {res}")
     return res
 
 def wait_for_cluster_ready():
diff --git a/e2e/requirements.txt b/e2e/requirements.txt
index 4a345f1cd..69b127c97 100644
--- a/e2e/requirements.txt
+++ b/e2e/requirements.txt
@@ -6,4 +6,4 @@ kubernetes==27.2.0
 requests==2.32.3
 boto3==1.35.19
 pyyaml==6.0.2
-minio==5.0.10
\ No newline at end of file
+minio==5.0.10