From 09935510bdb0d6a23e05523c97a7f6ba5b2651ec Mon Sep 17 00:00:00 2001
From: He Yin Ling <heyinling@espressif.com>
Date: Fri, 27 Dec 2019 17:58:36 +0800
Subject: [PATCH 1/4] ttfw: fix incorrect relative import for python3

---
 tools/ci/python_packages/tiny_test_fw/DUT.py    | 2 +-
 tools/ci/python_packages/tiny_test_fw/Env.py    | 2 +-
 tools/ci/python_packages/tiny_test_fw/TinyFW.py | 8 ++++----
 tools/ci/python_packages/ttfw_idf/__init__.py   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/ci/python_packages/tiny_test_fw/DUT.py b/tools/ci/python_packages/tiny_test_fw/DUT.py
index 71007d85b0..7c23711653 100644
--- a/tools/ci/python_packages/tiny_test_fw/DUT.py
+++ b/tools/ci/python_packages/tiny_test_fw/DUT.py
@@ -53,7 +53,7 @@ except ImportError:
 import serial
 from serial.tools import list_ports
 
-import Utility
+from . import Utility
 
 
 class ExpectTimeout(ValueError):
diff --git a/tools/ci/python_packages/tiny_test_fw/Env.py b/tools/ci/python_packages/tiny_test_fw/Env.py
index c6a9fb9ab3..c4769e6d93 100644
--- a/tools/ci/python_packages/tiny_test_fw/Env.py
+++ b/tools/ci/python_packages/tiny_test_fw/Env.py
@@ -19,7 +19,7 @@ import functools
 
 import netifaces
 
-import EnvConfig
+from . import EnvConfig
 
 
 def _synced(func):
diff --git a/tools/ci/python_packages/tiny_test_fw/TinyFW.py b/tools/ci/python_packages/tiny_test_fw/TinyFW.py
index f5ef7e1e69..6e2d03d38e 100644
--- a/tools/ci/python_packages/tiny_test_fw/TinyFW.py
+++ b/tools/ci/python_packages/tiny_test_fw/TinyFW.py
@@ -22,10 +22,10 @@ from datetime import datetime
 
 import junit_xml
 
-import Env
-import DUT
-import App
-import Utility
+from . import Env
+from . import DUT
+from . import App
+from . import Utility
 
 
 class DefaultEnvConfig(object):
diff --git a/tools/ci/python_packages/ttfw_idf/__init__.py b/tools/ci/python_packages/ttfw_idf/__init__.py
index 001da23095..a7c777194f 100644
--- a/tools/ci/python_packages/ttfw_idf/__init__.py
+++ b/tools/ci/python_packages/ttfw_idf/__init__.py
@@ -15,8 +15,8 @@ import os
 import re
 
 from tiny_test_fw import TinyFW, Utility
-from IDFApp import IDFApp, Example, UT
-from IDFDUT import IDFDUT
+from .IDFApp import IDFApp, Example, UT  # noqa: export all Apps for users
+from .IDFDUT import IDFDUT  # noqa: export DUTs for users
 
 
 def format_case_id(chip, case_name):

From 95f0553f40a3ba47e4ea281f02664527ef1dee0b Mon Sep 17 00:00:00 2001
From: He Yin Ling <heyinling@espressif.com>
Date: Fri, 27 Dec 2019 19:25:14 +0800
Subject: [PATCH 2/4] test: let unit test jobs use python3

---
 tools/ci/config/target-test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml
index a83506f56d..99c02c3a3e 100644
--- a/tools/ci/config/target-test.yml
+++ b/tools/ci/config/target-test.yml
@@ -68,6 +68,7 @@
     CONFIG_FILE_PATH: "${CI_PROJECT_DIR}/components/idf_test/unit_test/CIConfigs"
     LOG_PATH: "$CI_PROJECT_DIR/TEST_LOGS"
     ENV_FILE: "$CI_PROJECT_DIR/ci-test-runner-configs/$CI_RUNNER_DESCRIPTION/EnvConfig.yml"
+    PYTHON_VER: 3
 
 .test_template:
   stage: target_test

From ca3b2a890949188fe16aacf284b8140cbede91c4 Mon Sep 17 00:00:00 2001
From: He Yin Ling <heyinling@espressif.com>
Date: Mon, 30 Dec 2019 10:41:11 +0800
Subject: [PATCH 3/4] test: fix multiple devices cases fail on python3

---
 tools/unit-test-app/unit_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/unit-test-app/unit_test.py b/tools/unit-test-app/unit_test.py
index 6028f6f809..97ec069607 100755
--- a/tools/unit-test-app/unit_test.py
+++ b/tools/unit-test-app/unit_test.py
@@ -344,7 +344,7 @@ class Handler(threading.Thread):
 
         def device_wait_action(data):
             start_time = time.time()
-            expected_signal = data[0]
+            expected_signal = data[0].encode('utf-8')
             while 1:
                 if time.time() > start_time + self.timeout:
                     Utility.console_log("Timeout in device for function: %s" % self.child_case_name, color="orange")

From dae4da07c3ef40e2408d8ff982b773e748927bf0 Mon Sep 17 00:00:00 2001
From: He Yin Ling <heyinling@espressif.com>
Date: Mon, 30 Dec 2019 10:59:47 +0800
Subject: [PATCH 4/4] CI: reduce number of unit test jobs

---
 tools/ci/config/target-test.yml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml
index 99c02c3a3e..8a4ab5b7cc 100644
--- a/tools/ci/config/target-test.yml
+++ b/tools/ci/config/target-test.yml
@@ -223,7 +223,7 @@ example_test_009:
 
 UT_001:
   extends: .unit_test_template
-  parallel: 29
+  parallel: 28
   tags:
     - ESP32_IDF
     - UT_T1_1
@@ -233,7 +233,7 @@ UT_001:
 
 UT_002:
   extends: .unit_test_template
-  parallel: 10
+  parallel: 9
   tags:
     - ESP32_IDF
     - UT_T1_1
@@ -369,12 +369,6 @@ UT_033:
     - UT_T2_Ethernet
     - psram
 
-UT_034:
-  extends: .unit_test_template
-  tags:
-    - ESP32_IDF
-    - UT_T1_ESP_FLASH
-
 UT_035:
   extends: .unit_test_template
   tags: