From a42d1678ebb105abd30061926213bea8e40fd78f Mon Sep 17 00:00:00 2001
From: goldsimon <goldsimon@gmx.de>
Date: Fri, 17 Mar 2017 08:56:03 +0100
Subject: [PATCH] tcp unit tests: don't break later tests relying on loopif

---
 test/unit/tcp/test_tcp.c     |  9 +++++++++
 test/unit/tcp/test_tcp_oos.c | 11 ++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/test/unit/tcp/test_tcp.c b/test/unit/tcp/test_tcp.c
index d99b807d..f26e97fd 100644
--- a/test/unit/tcp/test_tcp.c
+++ b/test/unit/tcp/test_tcp.c
@@ -29,10 +29,16 @@ test_tcp_tmr(void)
 }
 
 /* Setups/teardown functions */
+static struct netif *old_netif_list;
+static struct netif *old_netif_default;
 
 static void
 tcp_setup(void)
 {
+  old_netif_list = netif_list;
+  old_netif_default = netif_default;
+  netif_list = NULL;
+  netif_default = NULL;
   /* reset iss to default (6510) */
   tcp_ticks = 0;
   tcp_ticks = 0 - (tcp_next_iss(NULL) - 6510);
@@ -49,6 +55,9 @@ tcp_teardown(void)
   netif_list = NULL;
   netif_default = NULL;
   tcp_remove_all();
+  /* restore netif_list for next tests (e.g. loopif) */
+  netif_list = old_netif_list;
+  netif_default = old_netif_default;
 }
 
 
diff --git a/test/unit/tcp/test_tcp_oos.c b/test/unit/tcp/test_tcp_oos.c
index be611722..67eec0a3 100644
--- a/test/unit/tcp/test_tcp_oos.c
+++ b/test/unit/tcp/test_tcp_oos.c
@@ -118,19 +118,28 @@ tcp_oos_tcplen(struct tcp_pcb* pcb)
 }
 
 /* Setup/teardown functions */
+static struct netif *old_netif_list;
+static struct netif *old_netif_default;
 
 static void
 tcp_oos_setup(void)
 {
+  old_netif_list = netif_list;
+  old_netif_default = netif_default;
+  netif_list = NULL;
+  netif_default = NULL;
   tcp_remove_all();
 }
 
 static void
 tcp_oos_teardown(void)
 {
-  tcp_remove_all();
   netif_list = NULL;
   netif_default = NULL;
+  tcp_remove_all();
+  /* restore netif_list for next tests (e.g. loopif) */
+  netif_list = old_netif_list;
+  netif_default = old_netif_default;
 }