sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 20:12:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Skip rpcbind_test if OS/network requirements are not met.

Browse Source
This commit is contained in:
John Newbery 2017-03-22 10:29:39 -04:00
parent 232b6665bc
commit 0c1ade6a4b
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/functional/rpcbind_test.py
View File

@ -4,6 +4,9 @@
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
"""Test running bitcoind with the -rpcbind and -rpcallowip options.""" """Test running bitcoind with the -rpcbind and -rpcallowip options."""
import socket
import sys
from test_framework.test_framework import BitcoinTestFramework from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import * from test_framework.util import *
from test_framework.netutil import * from test_framework.netutil import *
@ -52,7 +55,9 @@ class RPCBindTest(BitcoinTestFramework):
def run_test(self): def run_test(self):
# due to OS-specific network stats queries, this test works only on Linux # due to OS-specific network stats queries, this test works only on Linux
assert(sys.platform.startswith('linux')) if not sys.platform.startswith('linux'):
self.log.warning("This test can only be run on linux. Skipping test.")
sys.exit(self.TEST_EXIT_SKIPPED)
# find the first non-loopback interface for testing # find the first non-loopback interface for testing
non_loopback_ip = None non_loopback_ip = None
for name,ip in all_interfaces(): for name,ip in all_interfaces():
@ -60,7 +65,16 @@ class RPCBindTest(BitcoinTestFramework):
non_loopback_ip = ip non_loopback_ip = ip
break break
if non_loopback_ip is None: if non_loopback_ip is None:
assert(not 'This test requires at least one non-loopback IPv4 interface') self.log.warning("This test requires at least one non-loopback IPv4 interface. Skipping test.")
sys.exit(self.TEST_EXIT_SKIPPED)
try:
s = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
s.connect(("::1",1))
s.close
except OSError:
self.log.warning("This test requires IPv6 support. Skipping test.")
sys.exit(self.TEST_EXIT_SKIPPED)
self.log.info("Using interface %s for testing" % non_loopback_ip) self.log.info("Using interface %s for testing" % non_loopback_ip)
defaultport = rpc_port(0) defaultport = rpc_port(0)

2
test/functional/test_runner.py
View File

@ -248,7 +248,7 @@ def run_tests(test_list, src_dir, build_dir, exeext, jobs=1, enable_coverage=Fal
job_queue = TestHandler(jobs, tests_dir, test_list, flags) job_queue = TestHandler(jobs, tests_dir, test_list, flags)
max_len_name = len(max(test_list, key=len)) max_len_name = len(max(test_list, key=len))
results = BOLD[1] + "%s | %s | %s\n\n" % ("TEST".ljust(max_len_name), "PASSED ", "DURATION") + BOLD[0] results = BOLD[1] + "%s | %s | %s\n\n" % ("TEST".ljust(max_len_name), "STATUS ", "DURATION") + BOLD[0]
for _ in range(len(test_list)): for _ in range(len(test_list)):
(name, stdout, stderr, status, duration) = job_queue.get_next() (name, stdout, stderr, status, duration) = job_queue.get_next()
all_passed = all_passed and status != "Failed" all_passed = all_passed and status != "Failed"