fastlane-plugin-android_testlab_script_swit 0.1.38 → 0.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac05a3cb02ce74a34b2aa3795c6543287aa6e2da4c7df8ab8405a3b284fa1fca
-  data.tar.gz: 5707540ccf5c2b38602ddaf0578759eb5e17b89b0bbbb6c5e30b65b71682d234
+  metadata.gz: 791fc74ef48b4238b8eebf9877ec7339584b035caa99223cd5245f2a3692524e
+  data.tar.gz: adfad851a37d428347cd503186f4b861c4511c35fba23f492839b7b8a50a3e1c
 SHA512:
-  metadata.gz: ee8ad34c894b2e6d4323dcfb6ec73121c712c01668bcffe18f4ffe07ea3080553c1f5a7c04a421ced60a129a717c1f87f9b3459df96a4d0d3122f851efeac0c5
-  data.tar.gz: 542e117d09c7ad829ed94d79cd5429070caffe375fd26c16fa21b4c5bd6438ed9bc02571a1e3ca16bc0071224c379a8e99fc34323784911b3849e224e27cb48c
+  metadata.gz: 9a60c3bc108645bee420928e0f155da5ef7cc7760c9f9c6252bd0b0eb6ac3eebcd6ecb1cb4b5e765a3abb08aada567c3a467020f8e80879ab05c902fd0fb2f7a
+  data.tar.gz: ce74a3ce4cd883700afee578b7e93f2ac53001441f78d291ce83b03375e2e7e43c6134aa338dfc5a1675315c569a1c7bf2844c2862d891a158a0ad53608971ca

data/lib/fastlane/plugin/android_testlab_script_swit/actions/android_testlab_script_swit_action.rb

@@ -24,7 +24,7 @@ module Fastlane
         robo_script_option = params[:robo_script_path].nil? ? "" : "--robo-script #{params[:robo_script_path]} "
 
         # Run Firebase Test Lab
-        result_url = Helper.run_tests(params[:gcloud_components_channel], "--type #{params[:type]} "\
+        result_url = Helper.run_tests2(params[:gcloud_components_channel], "--type #{params[:type]} "\
                   "--app #{params[:app_apk]} "\
                   "#{"--test #{params[:app_test_apk]} " unless params[:app_test_apk].nil?}"\
                   "#{"--use-orchestrator " if params[:type] == "instrumentation" && params[:use_orchestrator]}"\
@@ -37,43 +37,24 @@ module Fastlane
                   "--format=json 1>#{Helper.if_need_dir(params[:console_log_file_name])}"
         )
 
-        wait_for_test_to_complete(test_results_url)
-
-#         swit_webhook_url = params[:swit_webhook_url]
-#         swit_webhook_payload = params[:swit_webhook_payload]
-#
-#         HTTParty.post(swit_webhook_url, body: swit_webhook_payload.to_json, headers: { 'Content-Type' => 'application/json' })
-
-#         json = JSON.parse(File.read(params[:console_log_file_name]))
-#         UI.message("Test status: #{json}")
-#
-#         # Fetch results
-#         download_dir = params[:download_dir]
-#         if download_dir
-#           UI.message("Fetch results from Firebase Test Lab results bucket")
-#           json.each do |status|
-#             axis = status["axis_value"]
-#             Helper.if_need_dir("#{download_dir}/#{axis}")
-#             Helper.copy_from_gcs("#{results_bucket}/#{results_dir}/#{axis}", download_dir)
-#             Helper.set_public("#{results_bucket}/#{results_dir}/#{axis}")
-#           end
-#         end
+#         wait_for_test_to_complete(test_results_url)
 
-        UI.message("Finish Action")
-      end
+        json = JSON.parse(File.read(params[:console_log_file_name]))
+        UI.message("Test status: #{json}")
 
-      def wait_for_test_to_complete(url)
-        require 'open-uri'
-
-        loop do
-            html = open(url).read
-
-            if html.include?("Test is complete")
-                break
-            else
-                sleep(10)   # wait for a few seconds before checking again.
-            end
+        # Fetch results
+        download_dir = params[:download_dir]
+        if download_dir
+          UI.message("Fetch results from Firebase Test Lab results bucket")
+          json.each do |status|
+            axis = status["axis_value"]
+            Helper.if_need_dir("#{download_dir}/#{axis}")
+            Helper.copy_from_gcs("#{results_bucket}/#{results_dir}/#{axis}", download_dir)
+            Helper.set_public("#{results_bucket}/#{results_dir}/#{axis}")
+          end
         end
+
+        UI.message("Finish Action")
       end
 
       # Short Detils

data/lib/fastlane/plugin/android_testlab_script_swit/helper/android_testlab_script_swit_helper.rb

@@ -37,6 +37,22 @@ module Fastlane
       Action.sh("set +e; gcloud #{gcloud_components_channel unless gcloud_components_channel == "stable"} firebase test android run #{arguments}; set -e")
     end
 
+    def self.run_tests2(gcloud_components_channel, arguments)
+      UI.message("Test running...")
+
+      thread = Thread.new do
+        Action.sh("set +e; gcloud #{gcloud_components_channel unless gcloud_components_channel == "stable"} firebase test android run #{arguments}; set -e")
+      end
+
+      while thread.alive?
+        # Do something while waiting for the test to complete...
+        sleep(10)   # wait for a few seconds before checking again.
+      end
+
+      UI.message("Test completed.")
+    end
+
+
     def self.copy_from_gcs(bucket_and_path, copy_to)
       UI.message("Copy from gs://#{bucket_and_path}")
       Action.sh("gsutil -m cp -r gs://#{bucket_and_path} #{copy_to}")

data/lib/fastlane/plugin/android_testlab_script_swit/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module AndroidTestlabScriptSwit
-    VERSION = "0.1.38"
+    VERSION = "0.1.40"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-android_testlab_script_swit
 version: !ruby/object:Gem::Version
-  version: 0.1.38
+  version: 0.1.40
 platform: ruby
 authors:
 - 나비이쁜이