Merge pull request #2760 from shirishaganta1/fix-smt-cpufold

Fixed smt.py and cpu_fold.py stop testcases
avocado-framework-tests · Feb 14, 2024 · 885dfc9 · 885dfc9
2 parents 530d043 + 9b193b8
commit 885dfc9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/workload/cpu_fold.py b/workload/cpu_fold.py
@@ -52,8 +52,8 @@ def test_cpu_stop(self):
         Kill the CPU workload
         """
         self.grep_cmd = "grep -i {}".format("cpu.sh")
-        self.process_kill = 'ps aux | {} | awk "{{ print $2 }}" | \
-                xargs kill'.format(self.grep_cmd)
+        self.awk_cmd = "awk '{print $2}'"
+        self.process_kill = "ps aux | {} | {} | head -1 | xargs kill".format(self.grep_cmd, self.awk_cmd)
         process.run(self.process_kill, ignore_status=True,
                     sudo=True, shell=True)
         self.log.info("CPU Workload killed successfully--!!")
diff --git a/workload/smt.py b/workload/smt.py
@@ -65,8 +65,8 @@ def test_smt_stop(self):
         Kill the SMT workload
         """
         grep_cmd = "grep -i {}".format("smt.sh")
-        process_kill = 'ps aux | {} | awk "{{ print $2 }}" | \
-                xargs kill'.format(grep_cmd)
+        awk_cmd = "awk '{print $2}'"
+        process_kill = "ps aux | {} | {} | head -1 | xargs kill".format(grep_cmd, awk_cmd)
         process.run(process_kill, ignore_status=True,
                     sudo=True, shell=True)
         self.log.info("SMT Workload killed successfully--!!")