Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: skip test that use --tls-v1.x flags #24376

Closed
wants to merge 7 commits into from
Closed

test: skip test that use --tls-v1.x flags #24376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4b34878
test: skip test that use --tls-v1.x flags
danbev Nov 15, 2018
7998059
squash: check more than the first flag option
danbev Nov 15, 2018
ed7c520
tools: add node_has_crypto Context class
danbev Nov 15, 2018
5775587
squash: update message when no inspector support
danbev Nov 15, 2018
971189c
squash: update skip messages
danbev Nov 15, 2018
1cf1462
squash: fix typo in inspector message
danbev Nov 15, 2018
57d17c3
squash: fix indentation and use single quotes
danbev Nov 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions test/testpy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def GetCommand(self):
source = open(self.file).read()
flags_match = FLAGS_PATTERN.search(source)
if flags_match:
flag = flags_match.group(1).strip().split()
flags = flags_match.group(1).strip().split()
# The following block reads config.gypi to extract the v8_enable_inspector
# value. This is done to check if the inspector is disabled in which case
# the '--inspect' flag cannot be passed to the node process as it will
Expand All @@ -71,13 +71,17 @@ def GetCommand(self):
# 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')
if (any(flag.startswith('--inspect') for flag in flags) and
not self.context.v8_enable_inspector):
print('Skipping as node was compiled without inspector support')
elif (('--use-bundled-ca' in flags or
'--use-openssl-ca' in flags or
'--tls-v1.0' in flags or
'--tls-v1.1' in flags) and
danbev marked this conversation as resolved.
Show resolved Hide resolved
not self.context.node_has_crypto):
print('Skipping as node was compiled without crypto support')
else:
result += flag
result += flags
files_match = FILES_PATTERN.search(source);
additional_files = []
if files_match:
Expand Down
12 changes: 9 additions & 3 deletions tools/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,6 +907,7 @@ def __init__(self, workspace, buildspace, verbose, vm, args, expect_fail,
self.repeat = repeat
self.abort_on_timeout = abort_on_timeout
self.v8_enable_inspector = True
self.node_has_crypto = True

def GetVm(self, arch, mode):
if arch == 'none':
Expand Down Expand Up @@ -1632,9 +1633,14 @@ def Main():

# We want to skip the inspector tests if node was built without the inspector.
has_inspector = Execute([vm,
"-p", "process.config.variables.v8_enable_inspector"], context)
if has_inspector.stdout.rstrip() == "0":
context.v8_enable_inspector = False
'-p', 'process.config.variables.v8_enable_inspector'], context)
if has_inspector.stdout.rstrip() == '0':
context.v8_enable_inspector = False

has_crypto = Execute([vm,
'-p', 'process.versions.openssl'], context)
if has_crypto.stdout.rstrip() == 'undefined':
context.node_has_crypto = False

if options.cat:
visited = set()
Expand Down