fix build fail

openthread · Aug 19, 2020 · ff5686d · ff5686d
1 parent 40adcb6
commit ff5686d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/tests/rest/test-rest-server b/tests/rest/test-rest-server
@@ -36,7 +36,6 @@ on_exit()
     local status=$?
 
     sudo killall otbr-agent || true
-    sudo killall nginx || true
     sudo killall expect || true
     sudo killall ot-cli-ftd || true
     sudo killall ot-cli-mtd || true
@@ -85,8 +84,6 @@ send "thread start\r\n"
 expect "Done"
 wait
 EOF
-    sleep 10
-    nginx
     sleep 10
     sudo python3 "${CMAKE_CURRENT_SOURCE_DIR}"/test_rest.py
 }

diff --git a/tests/rest/test_rest.py b/tests/rest/test_rest.py
@@ -37,8 +37,6 @@
 
 rest_api_addr = "http://0.0.0.0:8081"
 
-web_api_addr =  "http://0.0.0.0"
-
 def get_data_from_url(url, result, index):
     response = urllib.request.urlopen(urllib.request.Request(url))
     body = response.read()
@@ -438,7 +436,7 @@ def error_test(thread_num):
 
 
 def commissioner():
-    url = web_api_addr + "/v1/networks/current/commission"
+    url = rest_api_addr + "/v1/networks/current/commission"
     data = {
         'passphase': '123445',
         'pskd': 'ABCDEF',
@@ -468,7 +466,7 @@ def commissioner():
 
 
 def add_remove_prefix():
-    url = web_api_addr + "/v1/networks/current/prefix"
+    url = rest_api_addr + "/v1/networks/current/prefix"
     data = {
         'prefix': 'fd13:22::',
         'defaultRoute': True,
@@ -499,14 +497,14 @@ def add_remove_prefix():
 
 
 def form_network_test():
-    url = web_api_addr + "/v1/node/network-name"
+    url = rest_api_addr + "/v1/node/network-name"
 
     response = urllib.request.urlopen(urllib.request.Request(url))
     body = response.read()
     data = json.loads(body)
     assert data != 'OpenThreadTest1'
 
-    url = web_api_addr + "/v1/networks"
+    url = rest_api_addr + "/v1/networks"
     data = {
         'networkName': 'OpenThreadTest1',
         'extPanId': '1111111122222222',
@@ -527,7 +525,7 @@ def form_network_test():
 
     time.sleep(10)
 
-    url = web_api_addr + "/v1/node/network-name"
+    url = rest_api_addr + "/v1/node/network-name"
     response = urllib.request.urlopen(urllib.request.Request(url))
     body = response.read()
     data = json.loads(body)
@@ -536,7 +534,7 @@ def form_network_test():
 
 
 def scan():
-    url = web_api_addr + "/v1/networks"
+    url = rest_api_addr + "/v1/networks"
     response = urllib.request.urlopen(urllib.request.Request(url))
     body = response.read()
     data = json.loads(body)
@@ -551,7 +549,7 @@ def scan():
 
 
 def join():
-    url = web_api_addr + "/v1/networks/current"
+    url = rest_api_addr + "/v1/networks/current"
 
     data = {
         'extPanId': 'dead00beef00cafe',
@@ -573,7 +571,7 @@ def join():
 
     time.sleep(10)
 
-    url = web_api_addr + "/v1/diagnostics"
+    url = rest_api_addr + "/v1/diagnostics"
     response = urllib.request.urlopen(urllib.request.Request(url))
     body = response.read()
     data = json.loads(body)