Skip to content

Commit d1e8f68

Browse files
authored
Merge pull request #13 from PractiTest/get_test_and_step_names_from_config
parse test name and case name with read-query from config file
2 parents d2c36fc + bdc97ff commit d1e8f68

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

src/practitest_firecracker/cli.clj

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,14 @@
8989
(format "%s is required for '%s' action" option-name action-name))
9090

9191
(defn parse-config-file [options]
92-
(let [parsed-json (json/parse-stream (reader (:config-path options)) true)
93-
new-additional-test-fields (parse-additional-fields (json/generate-string (:additional-test-fields parsed-json)))
92+
(let [parsed-json (json/parse-stream (reader (:config-path options)) true)
93+
new-additional-test-fields (parse-additional-fields (json/generate-string (:additional-test-fields parsed-json)))
9494
new-additional-testset-fields (parse-additional-fields (json/generate-string (:additional-testset-fields parsed-json)))
95-
new-parsed-json (merge parsed-json {:additional-testset-fields new-additional-testset-fields
96-
:additional-test-fields new-additional-test-fields})]
95+
new-parsed-json (merge parsed-json
96+
(when (:additional-testset-fields parsed-json) {:additional-testset-fields new-additional-testset-fields})
97+
(when (:additional-test-fields parsed-json) {:additional-test-fields new-additional-test-fields})
98+
(when (:pt-test-name parsed-json) {:pt-test-name (read-query (:pt-test-name parsed-json))})
99+
(when (:pt-test-step-name parsed-json) {:pt-test-step-name (read-query (:pt-test-step-name parsed-json))}))]
97100
new-parsed-json))
98101

99102
(defn parse-args [args]

0 commit comments

Comments
 (0)