1616
1717set -Ee
1818
19+ test_timeout_seconds=300
1920
20- echo " These tests have been temporarily disabled. "
21- echo " See: https://github.com/flutter/flutter/issues/57061 "
22- exit 0
21+ # This is longer than the test timeout as dumping the
22+ # logs can sometimes take longer.
23+ ssh_timeout_seconds=360
2324
2425# The nodes are named blah-blah--four-word-fuchsia-id
2526device_name=${SWARMING_BOT_ID#* --}
@@ -40,6 +41,7 @@ reboot() {
4041
4142 ./fuchsia_ctl -d $device_name ssh \
4243 -c " log_listener --dump_logs yes" \
44+ --timeout-seconds $ssh_timeout_seconds \
4345 --identity-file $pkey
4446
4547 echo " $( date) START:REBOOT ------------------------------------------"
@@ -71,55 +73,58 @@ tar -xvzf $2 -C packages 1> /dev/null
7173echo " $( date) END:EXTRACT_PACKAGES -----------------------------------"
7274
7375
74- # TODO (kaushikiska): Re-enable these tests.
75- # see: https://github.com/flutter/flutter/issues/57061
7676# TODO(gw280): Enable tests using JIT runner
7777
78- # echo "$(date) START:flutter_runner_tests ----------------------------"
79- # ./fuchsia_ctl -d $device_name test \
80- # -f flutter_aot_runner-0.far \
81- # -f flutter_runner_tests-0.far \
82- # -t flutter_runner_tests \
83- # --identity-file $pkey \
84- # --timeout-seconds 300 \
85- # --packages-directory packages
86-
87- # ./fuchsia_ctl -d $device_name test \
88- # -f flutter_aot_runner-0.far \
89- # -f flutter_runner_scenic_tests-0.far \
90- # -t flutter_runner_scenic_tests \
91- # --identity-file $pkey \
92- # --timeout-seconds 300 \
93- # --packages-directory packages
78+ echo " $( date) START:flutter_runner_tests ----------------------------"
79+ ./fuchsia_ctl -d $device_name test \
80+ -f flutter_aot_runner-0.far \
81+ -f flutter_runner_tests-0.far \
82+ -t flutter_runner_tests \
83+ --identity-file $pkey \
84+ --timeout-seconds $test_timeout_seconds \
85+ --packages-directory packages
86+
87+ ./fuchsia_ctl -d $device_name test \
88+ -f flutter_aot_runner-0.far \
89+ -f flutter_runner_scenic_tests-0.far \
90+ -t flutter_runner_scenic_tests \
91+ --identity-file $pkey \
92+ --timeout-seconds $test_timeout_seconds \
93+ --packages-directory packages
9494
9595# TODO(https://github.com/flutter/flutter/issues/50032) Enable after the
9696# Fuchsia message loop migration is complete.
97- # echo "$(date) START:fml_tests ---------------------------------------"
98- # ./fuchsia_ctl -d $device_name test \
99- # -f fml_tests-0.far \
100- # -t fml_tests \
101- # -a "--gtest_filter=-MessageLoop*:Message*:FileTest*" \
102- # --identity-file $pkey \
103- # --timeout-seconds 300 \
104- # --packages-directory packages
97+ echo " $( date) START:fml_tests ---------------------------------------"
98+ ./fuchsia_ctl -d $device_name test \
99+ -f fml_tests-0.far \
100+ -t fml_tests \
101+ -a " --gtest_filter=-MessageLoop*:Message*:FileTest*" \
102+ --identity-file $pkey \
103+ --timeout-seconds $test_timeout_seconds \
104+ --packages-directory packages
105105
106106
107- # echo "$(date) START:flow_tests --------------------------------------"
108- # ./fuchsia_ctl -d $device_name test \
109- # -f flow_tests-0.far \
110- # -t flow_tests \
111- # --identity-file $pkey \
112- # --timeout-seconds 300 \
113- # --packages-directory packages
107+ echo " $( date) START:flow_tests --------------------------------------"
108+ ./fuchsia_ctl -d $device_name test \
109+ -f flow_tests-0.far \
110+ -t flow_tests \
111+ --identity-file $pkey \
112+ --timeout-seconds $test_timeout_seconds \
113+ --packages-directory packages
114+
115+
116+ # TODO(kaushikiska): Runtime and shell tests are failing with
117+ # async_dispatcher failures. Re-enable them once this gets fixed.
114118
115119# echo "$(date) START:runtime_tests -----------------------------------"
116120# ./fuchsia_ctl -d $device_name test \
117121# -f runtime_tests-0.far \
118122# -t runtime_tests \
119123# --identity-file $pkey \
120- # --timeout-seconds 300 \
124+ # --timeout-seconds $test_timeout_seconds \
121125# --packages-directory packages
122126
127+
123128# TODO(https://github.com/flutter/flutter/issues/53399): Re-enable
124129# OnServiceProtocolGetSkSLsWorks and CanLoadSkSLsFromAsset once they pass on
125130# Fuchsia.
@@ -129,5 +134,5 @@ echo "$(date) END:EXTRACT_PACKAGES -----------------------------------"
129134# -t shell_tests \
130135# -a "--gtest_filter=-ShellTest.CacheSkSLWorks:ShellTest.SetResourceCacheSize*:ShellTest.OnServiceProtocolGetSkSLsWorks:ShellTest.CanLoadSkSLsFromAsset" \
131136# --identity-file $pkey \
132- # --timeout-seconds 300 \
137+ # --timeout-seconds $test_timeout_seconds \
133138# --packages-directory packages
0 commit comments