Skip to content

Commit

Permalink
test: skip tests using ca flags
Browse files Browse the repository at this point in the history
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 <jasnell@gmail.com>
  • Loading branch information
danbev committed Apr 20, 2017
1 parent d8965d5 commit f3f9dd7
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions test/testpy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit f3f9dd7

Please sign in to comment.