TESTS: rename variable interface to fix broken tests

Qinghao Shi · Qinghao Shi · commit 8301854be1b7 · 2021-05-24T19:52:51.000Z
diff --git a/TESTS/integration/net-single/main.cpp b/TESTS/integration/net-single/main.cpp
@@ -56,15 +56,15 @@ void led_thread()
 #endif
 
 #define MAX_RETRIES 3
-NetworkInterface *interface = NULL;
+NetworkInterface *netif = NULL;
 static control_t setup_network(const size_t call_count)
 {
-    interface = NetworkInterface::get_default_instance();
-    TEST_ASSERT_NOT_NULL_MESSAGE(interface, "failed to initialize network");
+    netif = NetworkInterface::get_default_instance();
+    TEST_ASSERT_NOT_NULL_MESSAGE(netif, "failed to initialize network");
 
     nsapi_error_t err = -1;
     for (int tries = 0; tries < MAX_RETRIES; tries++) {
-        err = interface->connect();
+        err = netif->connect();
         if (err == NSAPI_ERROR_OK) {
             break;
         } else {
@@ -78,34 +78,34 @@ static control_t setup_network(const size_t call_count)
 
 static control_t download_128(const size_t call_count)
 {
-    download_test(interface, story, sizeof(story), 128);
+    download_test(netif, story, sizeof(story), 128);
 
     return CaseNext;
 }
 static control_t download_256(const size_t call_count)
 {
-    download_test(interface, story, sizeof(story), 256);
+    download_test(netif, story, sizeof(story), 256);
 
     return CaseNext;
 }
 
 static control_t download_1k(const size_t call_count)
 {
-    download_test(interface, story, sizeof(story), 1024);
+    download_test(netif, story, sizeof(story), 1024);
 
     return CaseNext;
 }
 
 static control_t download_2k(const size_t call_count)
 {
-    download_test(interface, story, sizeof(story), 2 * 1024);
+    download_test(netif, story, sizeof(story), 2 * 1024);
 
     return CaseNext;
 }
 
 static control_t download_4k(const size_t call_count)
 {
-    download_test(interface, story, sizeof(story), 4 * 1024);
+    download_test(netif, story, sizeof(story), 4 * 1024);
 
     return CaseNext;
 }
diff --git a/TESTS/integration/stress-net-fs/main.cpp b/TESTS/integration/stress-net-fs/main.cpp
@@ -61,16 +61,16 @@ void led_thread()
 #endif
 
 #define MAX_RETRIES 3
-NetworkInterface *interface = NULL;
+NetworkInterface *netif = NULL;
 
 static control_t setup_network(const size_t call_count)
 {
-    interface = NetworkInterface::get_default_instance();
-    TEST_ASSERT_NOT_NULL_MESSAGE(interface, "failed to initialize network");
+    netif = NetworkInterface::get_default_instance();
+    TEST_ASSERT_NOT_NULL_MESSAGE(netif, "failed to initialize network");
 
     nsapi_error_t err = -1;
     for (int tries = 0; tries < MAX_RETRIES; tries++) {
-        err = interface->connect();
+        err = netif->connect();
         if (err == NSAPI_ERROR_OK) {
             break;
         } else {
@@ -106,7 +106,7 @@ static uint32_t thread_counter = 0;
 void download_fn()
 {
     uint32_t thread_id = core_util_atomic_incr_u32(&thread_counter, 1);
-    download_test(interface, story, sizeof(story), 256, thread_id);
+    download_test(netif, story, sizeof(story), 256, thread_id);
 }
 void file_fn(size_t buffer)
 {

Original file line number	Diff line number	Diff line change
`@@ -56,15 +56,15 @@ void led_thread()`
`56`	`56`	`#endif`
`57`	`57`
`58`	`58`	`#define MAX_RETRIES 3`
`59`		`-NetworkInterface *interface = NULL;`
	`59`	`+NetworkInterface *netif = NULL;`
`60`	`60`	`static control_t setup_network(const size_t call_count)`
`61`	`61`	`{`
`62`		`- interface = NetworkInterface::get_default_instance();`
`63`		`- TEST_ASSERT_NOT_NULL_MESSAGE(interface, "failed to initialize network");`
	`62`	`+ netif = NetworkInterface::get_default_instance();`
	`63`	`+ TEST_ASSERT_NOT_NULL_MESSAGE(netif, "failed to initialize network");`
`64`	`64`
`65`	`65`	`nsapi_error_t err = -1;`
`66`	`66`	`for (int tries = 0; tries < MAX_RETRIES; tries++) {`
`67`		`- err = interface->connect();`
	`67`	`+ err = netif->connect();`
`68`	`68`	`if (err == NSAPI_ERROR_OK) {`
`69`	`69`	`break;`
`70`	`70`	`} else {`
`@@ -78,34 +78,34 @@ static control_t setup_network(const size_t call_count)`
`78`	`78`
`79`	`79`	`static control_t download_128(const size_t call_count)`
`80`	`80`	`{`
`81`		`- download_test(interface, story, sizeof(story), 128);`
	`81`	`+ download_test(netif, story, sizeof(story), 128);`
`82`	`82`
`83`	`83`	`return CaseNext;`
`84`	`84`	`}`
`85`	`85`	`static control_t download_256(const size_t call_count)`
`86`	`86`	`{`
`87`		`- download_test(interface, story, sizeof(story), 256);`
	`87`	`+ download_test(netif, story, sizeof(story), 256);`
`88`	`88`
`89`	`89`	`return CaseNext;`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`static control_t download_1k(const size_t call_count)`
`93`	`93`	`{`
`94`		`- download_test(interface, story, sizeof(story), 1024);`
	`94`	`+ download_test(netif, story, sizeof(story), 1024);`
`95`	`95`
`96`	`96`	`return CaseNext;`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`static control_t download_2k(const size_t call_count)`
`100`	`100`	`{`
`101`		`- download_test(interface, story, sizeof(story), 2 * 1024);`
	`101`	`+ download_test(netif, story, sizeof(story), 2 * 1024);`
`102`	`102`
`103`	`103`	`return CaseNext;`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`static control_t download_4k(const size_t call_count)`
`107`	`107`	`{`
`108`		`- download_test(interface, story, sizeof(story), 4 * 1024);`
	`108`	`+ download_test(netif, story, sizeof(story), 4 * 1024);`
`109`	`109`
`110`	`110`	`return CaseNext;`
`111`	`111`	`}`