Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/relative_import_error' into 'release/v3.3'

Browse source 
bugfix: import error in example tests

See merge request espressif/esp-idf!11003
This commit is contained in:
He Yin Ling 2020-10-29 10:42:51 +08:00
parent ec4124676f 312f100551
commit 66d3783c89
6 changed files with 37 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/bluetooth/nimble/blehr/blehr_test.py
View file

@ -20,9 +20,13 @@ import sys
import re import re
import threading import threading
import traceback import traceback
import Queue
import subprocess import subprocess
try:
import Queue
except ImportError:
import queue as Queue
try: try:
# This environment variable is expected on the host machine # This environment variable is expected on the host machine
test_fw_path = os.getenv("TEST_FW_PATH") test_fw_path = os.getenv("TEST_FW_PATH")

13
examples/system/ota/advanced_https_ota/example_test.py
View file

@ -2,11 +2,16 @@ import re
import os import os
import sys import sys
import socket import socket
import BaseHTTPServer
import SimpleHTTPServer
from threading import Thread from threading import Thread
import ssl import ssl
try:
import BaseHTTPServer
from SimpleHTTPServer import SimpleHTTPRequestHandler
except ImportError:
import http.server as BaseHTTPServer
from http.server import SimpleHTTPRequestHandler
try: try:
import IDF import IDF
except ImportError: except ImportError:
@ -110,7 +115,7 @@ def get_ca_cert(ota_image_dir):
def start_https_server(ota_image_dir, server_ip, server_port): def start_https_server(ota_image_dir, server_ip, server_port):
server_file, key_file = get_ca_cert(ota_image_dir) server_file, key_file = get_ca_cert(ota_image_dir)
httpd = BaseHTTPServer.HTTPServer((server_ip, server_port), httpd = BaseHTTPServer.HTTPServer((server_ip, server_port),
SimpleHTTPServer.SimpleHTTPRequestHandler) SimpleHTTPRequestHandler)
httpd.socket = ssl.wrap_socket(httpd.socket, httpd.socket = ssl.wrap_socket(httpd.socket,
keyfile=key_file, keyfile=key_file,
@ -128,7 +133,7 @@ def redirect_handler_factory(url):
""" """
Returns a request handler class that redirects to supplied `url` Returns a request handler class that redirects to supplied `url`
""" """
class RedirectHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): class RedirectHandler(SimpleHTTPRequestHandler):
def do_GET(self): def do_GET(self):
print("Sending resp, URL: " + url) print("Sending resp, URL: " + url)
self.send_response(301) self.send_response(301)

11
examples/system/ota/native_ota_example/example_test.py
View file

@ -2,11 +2,16 @@ import re
import os import os
import sys import sys
import socket import socket
import BaseHTTPServer
import SimpleHTTPServer
from threading import Thread from threading import Thread
import ssl import ssl
try:
import BaseHTTPServer
from SimpleHTTPServer import SimpleHTTPRequestHandler
except ImportError:
import http.server as BaseHTTPServer
from http.server import SimpleHTTPRequestHandler
try: try:
import IDF import IDF
except ImportError: except ImportError:
@ -110,7 +115,7 @@ def get_ca_cert(ota_image_dir):
def start_https_server(ota_image_dir, server_ip, server_port): def start_https_server(ota_image_dir, server_ip, server_port):
server_file, key_file = get_ca_cert(ota_image_dir) server_file, key_file = get_ca_cert(ota_image_dir)
httpd = BaseHTTPServer.HTTPServer((server_ip, server_port), httpd = BaseHTTPServer.HTTPServer((server_ip, server_port),
SimpleHTTPServer.SimpleHTTPRequestHandler) SimpleHTTPRequestHandler)
httpd.socket = ssl.wrap_socket(httpd.socket, httpd.socket = ssl.wrap_socket(httpd.socket,
keyfile=key_file, keyfile=key_file,

11
examples/system/ota/simple_ota_example/example_test.py
View file

@ -2,11 +2,16 @@ import re
import os import os
import sys import sys
import socket import socket
import BaseHTTPServer
import SimpleHTTPServer
from threading import Thread from threading import Thread
import ssl import ssl
try:
import BaseHTTPServer
from SimpleHTTPServer import SimpleHTTPRequestHandler
except ImportError:
import http.server as BaseHTTPServer
from http.server import SimpleHTTPRequestHandler
try: try:
import IDF import IDF
except ImportError: except ImportError:
@ -99,7 +104,7 @@ def start_https_server(ota_image_dir, server_ip, server_port):
key_file_handle.close() key_file_handle.close()
httpd = BaseHTTPServer.HTTPServer((server_ip, server_port), httpd = BaseHTTPServer.HTTPServer((server_ip, server_port),
SimpleHTTPServer.SimpleHTTPRequestHandler) SimpleHTTPRequestHandler)
httpd.socket = ssl.wrap_socket(httpd.socket, httpd.socket = ssl.wrap_socket(httpd.socket,
keyfile=key_file, keyfile=key_file,

0
tools/ble/__init__.py Normal file
View file

9
tools/ble/lib_ble_client.py
View file

@ -35,8 +35,13 @@ except ImportError as e:
print("Run `pip install -r $IDF_PATH/tools/ble/requirements.txt` for resolving the issue") print("Run `pip install -r $IDF_PATH/tools/ble/requirements.txt` for resolving the issue")
raise raise
from . import lib_gatt try:
from . import lib_gap import lib_gatt
import lib_gap
except ImportError:
# for python3 assign_test
from . import lib_gatt
from . import lib_gap
srv_added_old_cnt = 0 srv_added_old_cnt = 0
srv_added_new_cnt = 0 srv_added_new_cnt = 0