From a351b6767c41274fb7b41b9910f38e0c007ec128 Mon Sep 17 00:00:00 2001
From: Andrei Stepanov <astepano@redhat.com>
Date: Jul 22 2019 13:52:16 +0000
Subject: Merge #369 `rename parameter save-files to save_files`


---

diff --git a/roles/standard-test-basic/README.md b/roles/standard-test-basic/README.md
index ec321e3..f952321 100644
--- a/roles/standard-test-basic/README.md
+++ b/roles/standard-test-basic/README.md
@@ -23,7 +23,7 @@ to run testing.  You can redefine the following variables in
  * **dir**: test directory. default: is the test name
  * **run**: command to run the test. default: ./runtest.sh
  * **timeout**: abort test case after this time. More details on [timeout][1]. default: 0
- * **save-files**: List of extra files to save to artifacts.
+ * **save_files**: List of extra files to save to artifacts.
    Path to the file is relative to test directory. The files are saved to
    artifacts under test name directory. default: None
 
@@ -41,6 +41,8 @@ Example usage:
         - smoke27:
             dir: python/smoke
             run: VERSION=2.7 METHOD=virtualenv ./venv.sh
+            save_files:
+              - venv.sh
         - smoke37:
             dir: python/smoke
             run: VERSION=3.7 ./venv.sh
diff --git a/roles/standard-test-basic/tasks/main.yml b/roles/standard-test-basic/tasks/main.yml
index 50075e1..d0e5e6f 100644
--- a/roles/standard-test-basic/tasks/main.yml
+++ b/roles/standard-test-basic/tasks/main.yml
@@ -20,7 +20,7 @@
                 --test "{{ item if item.keys is not defined else (item.keys()|list)[0] }}" \
                 --timeout "{{ '0' if item.keys is not defined else item[(item.keys()|list)[0]]['timeout']|default('0') }}" \
                 --cmd "{{ './runtest.sh' if item.keys is not defined else item[(item.keys()|list)[0]]['run']|default('./runtest.sh') | regex_replace('\\', '\\\\') | regex_replace('\"', '\"') | regex_replace('\$', '\\$') }}" \
-                --save-files "{{ '' if item.keys is not defined else item[(item.keys()|list)[0]]['save-files']|default('') | join(',') | regex_replace('\\', '\\\\') | regex_replace('\"', '\"') | regex_replace('\$', '\\$') }}"
+                --save-files "{{ '' if item.keys is not defined else item[(item.keys()|list)[0]]['save_files']|default(item[(item.keys()|list)[0]]['save-files']|default('')) | join(',') | regex_replace('\\', '\\\\') | regex_replace('\"', '\"') | regex_replace('\$', '\\$') }}"
     with_items:
     - "{{ tests }}"
 
diff --git a/tests/basic.yml b/tests/basic.yml
index c40abce..0589b29 100644
--- a/tests/basic.yml
+++ b/tests/basic.yml
@@ -103,7 +103,7 @@
     tests:
     - test-basic-save-files:
         run: echo "file1" > file1.log; echo "file2" > file2.log
-        save-files:
+        save_files:
           - file*.log
     - basic-save-files-dir:
         dir: test-basic-save-files-dir