From ae7773d1d76c69ed2291132827ea590e538302fa Mon Sep 17 00:00:00 2001
From: Bruno Goncalves <bgoncalv@redhat.com>
Date: May 03 2019 13:27:08 +0000
Subject: add str_ prefix at begin of test


fix for: https://pagure.io/standard-test-roles/issue/339

---

diff --git a/roles/standard-test-basic/files/run-basic-test b/roles/standard-test-basic/files/run-basic-test
index 5bc42bc..60190ea 100755
--- a/roles/standard-test-basic/files/run-basic-test
+++ b/roles/standard-test-basic/files/run-basic-test
@@ -117,7 +117,7 @@ clean_exit() {
     local run_journal="$STR_ARTIFACTS_DIR/test.log"
     echo "${status} $STR_TEST_NAME" >> "$run_journal"
     if [ -e "$logfile_stdout" ]; then
-        local new_logfile_stdout="$(dirname "$logfile_stdout")/${status}_str_$(basename "$logfile_stdout")"
+        local new_logfile_stdout="$(dirname "$logfile_stdout")/${status}_$(basename "$logfile_stdout")"
         mv -f "$logfile_stdout" "$new_logfile_stdout"
     fi
     exit 0
@@ -126,8 +126,9 @@ trap clean_exit SIGINT SIGTERM SIGABRT EXIT
 
 export PATH="$PATH:$STR_WORKDIR"
 mkdir -p "$STR_ARTIFACTS_DIR"
-logfile_stdout="$STR_ARTIFACTS_DIR/$(echo "$STR_TEST_NAME" | sed -e 's/\//-/g').log"
-logfile_stderr="$STR_ARTIFACTS_DIR/$(echo "$STR_TEST_NAME" | sed -e 's/\//-/g')-err.log"
+# add str_ prefix to test logs
+logfile_stdout="$STR_ARTIFACTS_DIR/$(echo "str_$STR_TEST_NAME" | sed -e 's/\//-/g').log"
+logfile_stderr="$STR_ARTIFACTS_DIR/$(echo "str_$STR_TEST_NAME" | sed -e 's/\//-/g')-err.log"
 logfile_stdout="$(realpath "$logfile_stdout")"
 logfile_stderr="$(realpath "$logfile_stderr")"
 exec 3>&1 4>&2 1> >(tee -a "$logfile_stdout" >&3) 2> >(tee -a "$logfile_stderr" >&4)
diff --git a/tests/basic.yml b/tests/basic.yml
index 8233a04..22d0d2c 100644
--- a/tests/basic.yml
+++ b/tests/basic.yml
@@ -13,6 +13,10 @@
     - test-basic-parameters:
         dir: ./
         run: echo "check parameters on basic role" | grep "check parameters on basic role"
+    # make sure having testcase named 'test' doesn't delete test.log. see: https://pagure.io/standard-test-roles/issue/339
+    - test:
+        dir: ./
+        run: ls
     required_packages:
     # Test if we can install required packages
     - "{{req_pkg}}"