Skip to content

Commit f3f9dd7

Browse files
committed
test: skip tests using ca flags
Currently when building --without-ssl there is a failure due to a change made by me in commit 3cf88a4 ("test: add --use-bundled-ca to tls-cnnic-whitelist") which added a '--use-bundled-ca' flag to that test. But when building --without-ssl that flag will be invalid and an error (bad option) will be reported. This commit filters tests that specify the --use-bundled-ca or --use-openssl-ca flags so that they are skipped when configured --without-ssl. PR-URL: #12485 Reviewed-By: James M Snell <[email protected]>
1 parent d8965d5 commit f3f9dd7

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

test/testpy/__init__.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,14 @@ def GetCommand(self):
7272
# cause node to exit and report the test as failed. The use case
7373
# is currently when Node is configured --without-ssl and the tests should
7474
# still be runnable but skip any tests that require ssl (which includes the
75-
# inspector related tests).
76-
if flag[0].startswith('--inspect') and self.context.v8_enable_inspector == 0:
77-
print('Skipping as inspector is disabled')
75+
# inspector related tests). Also, if there is no ssl support the options
76+
# '--use-bundled-ca' and '--use-openssl-ca' will also cause a similar
77+
# failure so such tests are also skipped.
78+
if ('--inspect' in flag[0] or \
79+
'--use-bundled-ca' in flag[0] or \
80+
'--use-openssl-ca' in flag[0]) and \
81+
self.context.v8_enable_inspector == 0:
82+
print('Skipping as node was configured --without-ssl')
7883
else:
7984
result += flag
8085
files_match = FILES_PATTERN.search(source);

0 commit comments

Comments
 (0)