File tree Expand file tree Collapse file tree 2 files changed +6
-8
lines changed
tests/conformance-tests/src Expand file tree Collapse file tree 2 files changed +6
-8
lines changed Original file line number Diff line number Diff line change @@ -170,6 +170,8 @@ jobs:
170
170
- name : Run Integration Tests
171
171
run : |
172
172
make test-integration
173
+ env :
174
+ SPIN_CONFORMANCE_TESTS_DOCKER_OPT_OUT : true
173
175
# Only run integration tests on macOS as they will be run on ubuntu separately
174
176
if : ${{ matrix.runner == 'macos-14' }}
175
177
Original file line number Diff line number Diff line change @@ -16,15 +16,15 @@ pub fn run_test(
16
16
services. push ( "tcp-echo" ) ;
17
17
}
18
18
conformance_tests:: config:: Precondition :: Redis => {
19
- if is_docker_installed ( ) {
19
+ if should_run_docker_based_tests ( ) {
20
20
services. push ( "redis" )
21
21
} else {
22
22
// Skip the test if docker is not installed.
23
23
return Ok ( ( ) ) ;
24
24
}
25
25
}
26
26
conformance_tests:: config:: Precondition :: Mqtt => {
27
- if is_docker_installed ( ) {
27
+ if should_run_docker_based_tests ( ) {
28
28
services. push ( "mqtt" )
29
29
} else {
30
30
// Skip the test if docker is not installed.
@@ -73,10 +73,6 @@ pub fn run_test(
73
73
}
74
74
75
75
/// Whether or not docker is installed on the system.
76
- fn is_docker_installed ( ) -> bool {
77
- std:: process:: Command :: new ( "docker" )
78
- . arg ( "--version" )
79
- . output ( )
80
- . map ( |output| output. status . success ( ) )
81
- . unwrap_or ( false )
76
+ fn should_run_docker_based_tests ( ) -> bool {
77
+ std:: env:: var ( "SPIN_CONFORMANCE_TESTS_DOCKER_OPT_OUT" ) . is_err ( )
82
78
}
You can’t perform that action at this time.
0 commit comments