Merge pull request #5076 from SeroSun/yosun/rm_script_output

POO#29637 Replace script_output(foo) with other code
os-autoinst · May 18, 2018 · 4e89dee · 4e89dee
2 parents 5747eee + 3847e26
commit 4e89dee
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/tests/qa_automation/execute_test_run.pm b/tests/qa_automation/execute_test_run.pm
@@ -34,13 +34,12 @@ sub run {
 
     #output result to serial0 and upload test log
     if (get_var("QA_TESTSUITE")) {
-        my $test_log = script_output("ls /var/log/qa/ctcs2/");
-        my $tarball  = "/tmp/$test_log.tar.bz2";
-        assert_script_run("tar cjf $tarball -C /var/log/qa/ctcs2 $test_log");
+        my $tarball = "/tmp/testlog.tar.bz2";
+        assert_script_run("tar cjf $tarball -C /var/log/qa/ctcs2 `ls /var/log/qa/ctcs2/`");
         upload_logs($tarball, timeout => 600);
 
         #convert to junit log
-        my $script_output = script_output("cat $run_log");
+        my $script_output = get_test_data($run_log);
         my $tc_result     = analyzeResult($script_output);
         my $xml_result    = generateXML($tc_result);
         script_output "echo \'$xml_result\' > /tmp/output.xml", 7200;