From 11c54b85da31af21cea77601a906d8ea7033e601 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Tue, 18 Apr 2017 15:16:00 +0200 Subject: [PATCH] test: skip tests using ca flags Currently when building --without-ssl there is a failure due to a change made by me in commit 3cf88a45e86f28dcc72c730adf4ead919ab882bd ("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. --- test/testpy/__init__.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test/testpy/__init__.py b/test/testpy/__init__.py index f999b6a6baafaf..f7f64b7eb1d602 100644 --- a/test/testpy/__init__.py +++ b/test/testpy/__init__.py @@ -72,9 +72,14 @@ def GetCommand(self): # cause node to exit and report the test as failed. The use case # is currently when Node is configured --without-ssl and the tests should # still be runnable but skip any tests that require ssl (which includes the - # inspector related tests). - if flag[0].startswith('--inspect') and self.context.v8_enable_inspector == 0: - print('Skipping as inspector is disabled') + # inspector related tests). Also, if there is no ssl support the options + # '--use-bundled-ca' and '--use-openssl-ca' will also cause a similar + # failure so such tests are also skipped. + if ('--inspect' in flag[0] or \ + '--use-bundled-ca' in flag[0] or \ + '--use-openssl-ca' in flag[0]) and \ + self.context.v8_enable_inspector == 0: + print('Skipping as node was configured --without-ssl') else: result += flag files_match = FILES_PATTERN.search(source);