diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-03-07 10:29:57 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-03-07 10:30:04 -0500 |
| commit | 791c3ea61b4e49fd46a1a71b84ca99ddf69d2ff7 (patch) | |
| tree | b0364e01927057cbfb2b78861c44f69bb7888e1c /test/functional/test_framework | |
| parent | da9a2f5cd9032ee22acc5c2dc175e6934f63132c (diff) | |
| parent | fa3528a85b05ea9507077f3eb340c9fb189251a6 (diff) | |
| download | bitcoin-791c3ea61b4e49fd46a1a71b84ca99ddf69d2ff7.tar.xz | |
Merge #12627: qa: Fix some tests to work on native windows
fa3528a85b qa: Fix some tests to work on native windows (MarcoFalke)
Pull request description:
This allows some more tests to be run natively on Windows
Tree-SHA512: 8097a82dc046be9f6bb0da634758c9afef7836960ca7a1f88f9acab9512dbf7bc26525b515faae407edab4620846cce2b427940298f822e250f23f924b4c7591
Diffstat (limited to 'test/functional/test_framework')
| -rw-r--r-- | test/functional/test_framework/netutil.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/functional/test_framework/netutil.py b/test/functional/test_framework/netutil.py index 96fe283347..36d1a2f856 100644 --- a/test/functional/test_framework/netutil.py +++ b/test/functional/test_framework/netutil.py @@ -9,7 +9,6 @@ Roughly based on http://voorloopnul.com/blog/a-python-netstat-in-less-than-100-l import sys import socket -import fcntl import struct import array import os @@ -90,6 +89,8 @@ def all_interfaces(): ''' Return all interfaces that are up ''' + import fcntl # Linux only, so only import when required + is_64bits = sys.maxsize > 2**32 struct_size = 40 if is_64bits else 32 s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) |