[tests] skipped tests should clean up after themselves

This commit is contained in:
John Newbery
2017-05-18 16:36:39 -04:00
parent e4775167cb
commit 930deb9b2c
3 changed files with 37 additions and 25 deletions

View File

@@ -7,7 +7,7 @@
import socket
import sys
from test_framework.test_framework import BitcoinTestFramework
from test_framework.test_framework import BitcoinTestFramework, SkipTest
from test_framework.util import *
from test_framework.netutil import *
@@ -56,8 +56,7 @@ class RPCBindTest(BitcoinTestFramework):
def run_test(self):
# due to OS-specific network stats queries, this test works only on 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)
raise SkipTest("This test can only be run on linux.")
# find the first non-loopback interface for testing
non_loopback_ip = None
for name,ip in all_interfaces():
@@ -65,15 +64,13 @@ class RPCBindTest(BitcoinTestFramework):
non_loopback_ip = ip
break
if non_loopback_ip is None:
self.log.warning("This test requires at least one non-loopback IPv4 interface. Skipping test.")
sys.exit(self.TEST_EXIT_SKIPPED)
raise SkipTest("This test requires at least one non-loopback IPv4 interface.")
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)
raise SkipTest("This test requires IPv6 support.")
self.log.info("Using interface %s for testing" % non_loopback_ip)