diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2016-01-14 01:47:36 +0900 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2016-01-14 17:41:17 +0900 |
| commit | eda52a427837c5840e991f41e0fcfb9b5dfc38a9 (patch) | |
| tree | 773296b98109056fd8c951c50be006050fb5085f /tests | |
| parent | 3765e50c6f0dafbf04ec58d586b9b3203bc9848f (diff) | |
| download | extras-eda52a427837c5840e991f41e0fcfb9b5dfc38a9.tar.gz | |
Don't run the sock_diag tests twice.
TcpTest inherits from SockDiagTest, which means it runs all the
SockDiagTest test methods as well. Fix this by making the two
inherit from a new base class with no test methods.
Change-Id: I6aa1bb987be00ba29317ab035f2ab3d3cb8e5b9e
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/net_test/sock_diag_test.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/net_test/sock_diag_test.py b/tests/net_test/sock_diag_test.py index 2ca1bb05..eb5eb63e 100755 --- a/tests/net_test/sock_diag_test.py +++ b/tests/net_test/sock_diag_test.py @@ -37,7 +37,8 @@ ALL_NON_TIME_WAIT = 0xffffffff & ~(1 << sock_diag.TCP_TIME_WAIT) # TODO: Backport SOCK_DESTROY and delete this. HAVE_SOCK_DESTROY = net_test.LINUX_VERSION >= (4, 4) -class SockDiagTest(multinetwork_base.MultiNetworkBaseTest): + +class SockDiagBaseTest(multinetwork_base.MultiNetworkBaseTest): @staticmethod def _CreateLotsOfSockets(): @@ -51,6 +52,9 @@ class SockDiagTest(multinetwork_base.MultiNetworkBaseTest): socketpairs[(addr, sport, dport)] = socketpair return socketpairs + +class SockDiagTest(SockDiagBaseTest): + def setUp(self): super(SockDiagTest, self).setUp() self.sock_diag = sock_diag.SockDiag() @@ -216,7 +220,7 @@ class SocketExceptionThread(threading.Thread): # TODO: Take a tun fd as input, make this a utility class, and reuse at least # in forwarding_test. -class TcpTest(SockDiagTest): +class TcpTest(SockDiagBaseTest): NOT_YET_ACCEPTED = -1 |