Merge pull request #17 from rc185202/Runs_CustomAttributesUpdate

Added run custom attributes

Author: shmuelko

README.md

@@ -60,8 +60,9 @@ parameters:
 --email=YOUR_EMAIL
 --testset-name=TESTSET_NAME
 --project-id=PRACTITEST_PROJECT_ID
---additional-test-fields='{"custom-fields": {"---f-123": "foo", "---f-124": "bar"}, "system-fields"{"version": "2.3", "status":"Draft"}}'
---additional-testset-fields='{"custom-fields": {"---f-125": "baz"}, "system-fields"{"version": "1.0", "assigned-to-id": "1"}}
+--additional-test-fields '{"custom-fields": {"---f-123": "foo", "---f-124": "bar"}, "system-fields"{"version": "2.3", "status":"Draft"}}'
+--additional-testset-fields '{"custom-fields": {"---f-125": "baz"}, "system-fields"{"version": "1.0", "assigned-to-id": "1"}}
+--additional-run-fields '{"custom-fields": {"---f-124": "test"}, "system-fields"{}}
 if they are relevant to the run (additional-fields not required).
 
 
@@ -77,6 +78,7 @@ java -jar practitest-firecracker-standalone.jar \
     --author-id=PRACTITEST_USER_ID \
     --additional-test-fields '{"custom-fields": {"---f-123": "foo", "---f-124": "bar"}}' \
     --additional-testset-fields '{"custom-fields": {"---f-125": "baz"}}' \
+    --additional-run-fields '{"custom-fields": {"---f-124": "test"}, "system-fields"{}}' \
     create-and-populate-testset
 ```
 

src/practitest_firecracker/cli.clj

@@ -47,6 +47,10 @@
     "JSON containing the fields that should be added when creating PractiTest TestSet"
     :default {}
     :parse-fn parse-additional-fields]
+   [nil "--additional-run-fields JSON"
+    "JSON containing the fields that should be added when creating PractiTest Runs"
+    :default {}
+    :parse-fn parse-additional-fields]    
    ;; [nil "--test-case-as-pt-test" :default true]
    [nil "--test-case-as-pt-test-step" :default true]
    #_[nil "--pt-test-name DSL"
@@ -89,9 +93,11 @@
   (let [parsed-json                   (json/parse-stream (reader (:config-path options)) true)
         new-additional-test-fields    (parse-additional-fields (json/generate-string (:additional-test-fields parsed-json)))
         new-additional-testset-fields (parse-additional-fields (json/generate-string (:additional-testset-fields parsed-json)))
+        new-additional-run-fields    (parse-additional-fields (json/generate-string (:additional-run-fields parsed-json)))
         new-parsed-json               (merge parsed-json
                                              (when (:additional-testset-fields parsed-json) {:additional-testset-fields new-additional-testset-fields})
                                              (when (:additional-test-fields parsed-json) {:additional-test-fields new-additional-test-fields})
+                                             (when (:additional-run-fields parsed-json) {:additional-run-fields new-additional-run-fields})
                                              (when (:pt-test-name parsed-json) {:pt-test-name (read-query (:pt-test-name parsed-json))})
                                              (when (:pt-test-step-name parsed-json) {:pt-test-step-name (read-query (:pt-test-step-name parsed-json))}))]
     new-parsed-json))

src/practitest_firecracker/practitest.clj

@@ -477,17 +477,24 @@
   [{:run-duration (:time-elapsed test-suite)}
    (map (partial sf-test-case->run-step-def options) (:test-cases test-suite))])
 
+(defn sf-test-run->run-def [custom-fields run-duration]
+  {:run-duration (:time-elapsed run-duration),
+   :custom-fields (:custom-fields custom-fields)})
+
 (defn make-runs [[test-by-id instance-to-ts-test] client {:keys [project-id display-action-logs] :as options} start-time]
   (when display-action-logs (log/infof "make-runs"))
   (flatten (doall
             (for [[test-testset instances] instance-to-ts-test]
               (for [instance instances]
                 (let [[ts-id test-id] test-testset
                       tst (first (get test-by-id test-id))
-                      [run run-steps] (sf-test-suite->run-def options (get tst 1))]
-                  {:instance-id (:id instance)
+                      [run run-steps] (sf-test-suite->run-def options (get tst 1))
+                      additional-run-fields (eval-additional-fields run (:additional-run-fields options))
+                      additional-run-fields (merge additional-run-fields (:system-fields additional-run-fields))
+                      run (sf-test-run->run-def additional-run-fields (get tst 1))]
+                  {:instance-id (:id instance)                   
                    :attributes run
-                   :steps run-steps}))))))
+                   :steps run-steps})))))) 
 
 (defn find-sf-testset [client [project-id display-action-logs] options testset-name]
   (let [testset (ll-find-testset client [project-id display-action-logs] testset-name)]