From 4de2054541e9705fbd069676baffd8ad9c146b6c Mon Sep 17 00:00:00 2001 From: Yinling Date: Tue, 27 Sep 2016 16:22:51 +0800 Subject: [PATCH] fix bugs in config files: 1. filter name is "Add" not "ADD" 2. SSC_T1_APC is special environment 3. remove "debug mode" from config as it will implemented with other ways --- components/test/CIConfigs/Function_SYS_01.yml | 4 +- .../test/CIConfigs/Function_TCPIP_01.yml | 4 +- .../test/CIConfigs/Function_TCPIP_02.yml | 4 +- .../test/CIConfigs/Function_TCPIP_03.yml | 4 +- .../test/CIConfigs/Function_TCPIP_04.yml | 4 +- .../test/CIConfigs/Function_TCPIP_05.yml | 4 +- .../test/CIConfigs/Function_TCPIP_06.yml | 4 +- .../test/CIConfigs/Function_TCPIP_07.yml | 4 +- .../test/CIConfigs/Function_WIFI_01.yml | 14 +- .../test/CIConfigs/Function_WIFI_02.yml | 13 +- .../test/CIConfigs/Function_WIFI_03.yml | 5 + components/test/TestCaseAll.yml | 196 ------------------ components/test/TestEnvAll.yml | 2 +- 13 files changed, 35 insertions(+), 227 deletions(-) create mode 100644 components/test/CIConfigs/Function_WIFI_03.yml diff --git a/components/test/CIConfigs/Function_SYS_01.yml b/components/test/CIConfigs/Function_SYS_01.yml index 501f15f6ba..51a6899029 100644 --- a/components/test/CIConfigs/Function_SYS_01.yml +++ b/components/test/CIConfigs/Function_SYS_01.yml @@ -1,5 +1,5 @@ -Config: {debug mode: false, execute count: 1, execute order: in order} +Config: {execute count: 1, execute order: in order} DUT: [SSC1] Filter: -- ADD: +- Add: ID: [SYS_MISC_0101, SYS_MISC_0201] diff --git a/components/test/CIConfigs/Function_TCPIP_01.yml b/components/test/CIConfigs/Function_TCPIP_01.yml index 9b43ab589b..7eb46ef552 100644 --- a/components/test/CIConfigs/Function_TCPIP_01.yml +++ b/components/test/CIConfigs/Function_TCPIP_01.yml @@ -1,7 +1,7 @@ -Config: {debug mode: false, execute count: 1, execute order: in order} +Config: {execute count: 1, execute order: in order} DUT: [SSC2, SSC1] Filter: -- ADD: +- Add: ID: [TCPIP_ICMP_0101, TCPIP_ARP_0202, ^TCPIP_DHCP_0302, ^TCPIP_DHCP_0301, ^TCPIP_UDP_0113, TCPIP_DHCP_0302, TCPIP_DHCP_0301, TCPIP_ARP_0204, TCPIP_TCP_0412, TCPIP_TCP_0403, TCPIP_TCP_0402, TCPIP_TCP_0401, TCPIP_TCP_0407, TCPIP_TCP_0406, TCPIP_TCP_0404, diff --git a/components/test/CIConfigs/Function_TCPIP_02.yml b/components/test/CIConfigs/Function_TCPIP_02.yml index 7e0a3ead43..0cafa781b9 100644 --- a/components/test/CIConfigs/Function_TCPIP_02.yml +++ b/components/test/CIConfigs/Function_TCPIP_02.yml @@ -1,7 +1,7 @@ -Config: {debug mode: false, execute count: 1, execute order: in order} +Config: {execute count: 1, execute order: in order} DUT: [SSC2, SSC1] Filter: -- ADD: +- Add: ID: [^TCPIP_IGMP_0104, ^TCPIP_UDP_0110, TCPIP_IGMP_0104, TCPIP_IGMP_0103, TCPIP_IGMP_0102, TCPIP_IGMP_0101, ^TCPIP_UDP_0201, ^TCPIP_ICMP_0101, TCPIP_UDP_0108, TCPIP_UDP_0109, TCPIP_UDP_0106, TCPIP_UDP_0107, TCPIP_UDP_0104, TCPIP_UDP_0105, TCPIP_UDP_0102, diff --git a/components/test/CIConfigs/Function_TCPIP_03.yml b/components/test/CIConfigs/Function_TCPIP_03.yml index 33dcd14bea..cdaad25869 100644 --- a/components/test/CIConfigs/Function_TCPIP_03.yml +++ b/components/test/CIConfigs/Function_TCPIP_03.yml @@ -1,7 +1,7 @@ -Config: {debug mode: false, execute count: 1, execute order: in order} +Config: {execute count: 1, execute order: in order} DUT: [SSC2, SSC1] Filter: -- ADD: +- Add: ID: [^TCPIP_UDP_0305, ^TCPIP_UDP_0304, ^TCPIP_TCP_0101, ^TCPIP_TCP_0103, ^TCPIP_TCP_0102, ^TCPIP_TCP_0105, ^TCPIP_TCP_0104, ^TCPIP_TCP_0107, ^TCPIP_TCP_0106, ^TCPIP_DHCP_0210, ^TCPIP_DHCP_0211, TCPIP_TCP_0212, TCPIP_TCP_0210, ^TCPIP_TCP_0210, ^TCPIP_TCP_0212, diff --git a/components/test/CIConfigs/Function_TCPIP_04.yml b/components/test/CIConfigs/Function_TCPIP_04.yml index af2cc7d22f..3476bb7069 100644 --- a/components/test/CIConfigs/Function_TCPIP_04.yml +++ b/components/test/CIConfigs/Function_TCPIP_04.yml @@ -1,7 +1,7 @@ -Config: {debug mode: false, execute count: 1, execute order: in order} +Config: {execute count: 1, execute order: in order} DUT: [SSC2, SSC1] Filter: -- ADD: +- Add: ID: [^TCPIP_IGMP_0203, ^TCPIP_IGMP_0202, ^TCPIP_IGMP_0204, TCPIP_UDP_0114, TCPIP_UDP_0111, TCPIP_UDP_0110, TCPIP_UDP_0113, TCPIP_UDP_0112, ^TCPIP_TCP_0201, ^TCPIP_TCP_0206, ^TCPIP_TCP_0207, TCPIP_TCP_0501, ^TCPIP_DNS_0101, ^TCPIP_DNS_0103, ^TCPIP_DNS_0102, diff --git a/components/test/CIConfigs/Function_TCPIP_05.yml b/components/test/CIConfigs/Function_TCPIP_05.yml index a89ece34cc..85b6e72d8b 100644 --- a/components/test/CIConfigs/Function_TCPIP_05.yml +++ b/components/test/CIConfigs/Function_TCPIP_05.yml @@ -1,7 +1,7 @@ -Config: {debug mode: false, execute count: 1, execute order: in order} +Config: {execute count: 1, execute order: in order} DUT: [SSC2, SSC1] Filter: -- ADD: +- Add: ID: [TCPIP_UDP_0305, TCPIP_UDP_0306, TCPIP_UDP_0307, TCPIP_UDP_0301, TCPIP_UDP_0302, TCPIP_UDP_0303, ^TCPIP_DHCP_0209, ^TCPIP_DHCP_0208, ^TCPIP_DHCP_0207, ^TCPIP_DHCP_0206, ^TCPIP_DHCP_0205, ^TCPIP_DHCP_0204, ^TCPIP_DHCP_0203, ^TCPIP_DHCP_0202, ^TCPIP_DHCP_0201, diff --git a/components/test/CIConfigs/Function_TCPIP_06.yml b/components/test/CIConfigs/Function_TCPIP_06.yml index 929aafd13e..1aceda2b73 100644 --- a/components/test/CIConfigs/Function_TCPIP_06.yml +++ b/components/test/CIConfigs/Function_TCPIP_06.yml @@ -1,7 +1,7 @@ -Config: {debug mode: false, execute count: 1, execute order: in order} +Config: {execute count: 1, execute order: in order} DUT: [SSC2, SSC1] Filter: -- ADD: +- Add: ID: [TCPIP_DHCP_0201, ^TCPIP_TCP_0208, TCPIP_DHCP_0208, TCPIP_DHCP_0209, ^TCPIP_TCP_0412, ^TCPIP_TCP_0411, TCPIP_ARP_0203, ^TCPIP_UDP_0112, ^TCPIP_UDP_0114, ^TCPIP_UDP_0202, ^TCPIP_IGMP_0103, ^TCPIP_IP_0101, TCPIP_ARP_0201, TCPIP_TCP_0115, TCPIP_TCP_0114, diff --git a/components/test/CIConfigs/Function_TCPIP_07.yml b/components/test/CIConfigs/Function_TCPIP_07.yml index d42b5902ad..7cf6279995 100644 --- a/components/test/CIConfigs/Function_TCPIP_07.yml +++ b/components/test/CIConfigs/Function_TCPIP_07.yml @@ -1,5 +1,5 @@ -Config: {debug mode: false, execute count: 1, execute order: in order} +Config: {execute count: 1, execute order: in order} DUT: [SSC1] Filter: -- ADD: +- Add: ID: [TCPIP_TCP_0405, ^TCPIP_TCP_0405] diff --git a/components/test/CIConfigs/Function_WIFI_01.yml b/components/test/CIConfigs/Function_WIFI_01.yml index 594a1fc212..4a6b3e0c17 100644 --- a/components/test/CIConfigs/Function_WIFI_01.yml +++ b/components/test/CIConfigs/Function_WIFI_01.yml @@ -1,11 +1,11 @@ -Config: {debug mode: false, execute count: 1, execute order: in order} +Config: {execute count: 1, execute order: in order} DUT: [SSC2, SSC1] Filter: -- ADD: +- Add: ID: [^WIFI_CONN_0601, ^WIFI_ADDR_0101, ^WIFI_CONN_0903, WIFI_SCAN_0103, WIFI_SCAN_0102, WIFI_SCAN_0101, WIFI_SCAN_0105, WIFI_SCAN_0104, WIFI_CONN_0201, WIFI_CONN_0702, - WIFI_CONN_0703, WIFI_CONN_0701, WIFI_CONN_0904, ^WIFI_CONN_0201, ^WIFI_CONN_0701, - ^WIFI_CONN_0703, ^WIFI_SCAN_0102, ^WIFI_SCAN_0103, ^WIFI_SCAN_0104, ^WIFI_SCAN_0105, - ^WIFI_ADDR_0102, WIFI_CONN_0401, ^WIFI_CONN_0103, WIFI_ADDR_0101, WIFI_ADDR_0102, - WIFI_CONN_0301, ^WIFI_CONN_0801, WIFI_CONN_0104, ^WIFI_CONN_0301, WIFI_CONN_0501, - WIFI_CONN_0502] + WIFI_CONN_0703, WIFI_CONN_0904, ^WIFI_CONN_0201, ^WIFI_CONN_0703, ^WIFI_SCAN_0102, + ^WIFI_SCAN_0103, ^WIFI_SCAN_0104, ^WIFI_SCAN_0105, ^WIFI_ADDR_0102, WIFI_CONN_0401, + ^WIFI_CONN_0103, WIFI_ADDR_0101, WIFI_ADDR_0102, WIFI_CONN_0301, ^WIFI_CONN_0801, + WIFI_CONN_0104, ^WIFI_CONN_0301, WIFI_CONN_0501, WIFI_CONN_0502, ^WIFI_CONN_0401, + WIFI_MODE_0101] diff --git a/components/test/CIConfigs/Function_WIFI_02.yml b/components/test/CIConfigs/Function_WIFI_02.yml index 30735791b7..78ef087b59 100644 --- a/components/test/CIConfigs/Function_WIFI_02.yml +++ b/components/test/CIConfigs/Function_WIFI_02.yml @@ -1,9 +1,8 @@ -Config: {debug mode: false, execute count: 1, execute order: in order} +Config: {execute count: 1, execute order: in order} DUT: [SSC2, SSC1] Filter: -- ADD: - ID: [^WIFI_CONN_0401, WIFI_MODE_0101, WIFI_MODE_0103, WIFI_MODE_0102, ^WIFI_CONN_0904, - ^WIFI_CONN_0902, ^WIFI_CONN_0901, WIFI_CONN_0601, WIFI_CONN_0901, WIFI_CONN_0902, - WIFI_CONN_0903, WIFI_CONN_0503, ^WIFI_CONN_0104, WIFI_CONN_0101, WIFI_CONN_0102, - WIFI_CONN_0103, ^WIFI_CONN_0702, WIFI_CONN_0801, ^WIFI_CONN_0101, ^WIFI_CONN_0503, - ^WIFI_CONN_0502, ^WIFI_CONN_0501, ^WIFI_SCAN_0101] +- Add: + ID: [WIFI_MODE_0103, WIFI_MODE_0102, ^WIFI_CONN_0904, ^WIFI_CONN_0901, WIFI_CONN_0601, + WIFI_CONN_0901, WIFI_CONN_0903, WIFI_CONN_0503, ^WIFI_CONN_0104, WIFI_CONN_0101, + WIFI_CONN_0102, WIFI_CONN_0103, ^WIFI_CONN_0702, WIFI_CONN_0801, ^WIFI_CONN_0101, + ^WIFI_CONN_0503, ^WIFI_CONN_0502, ^WIFI_CONN_0501, ^WIFI_SCAN_0101] diff --git a/components/test/CIConfigs/Function_WIFI_03.yml b/components/test/CIConfigs/Function_WIFI_03.yml new file mode 100644 index 0000000000..1ac97dece3 --- /dev/null +++ b/components/test/CIConfigs/Function_WIFI_03.yml @@ -0,0 +1,5 @@ +Config: {execute count: 1, execute order: in order} +DUT: [SSC1] +Filter: +- Add: + ID: [WIFI_CONN_0701, ^WIFI_CONN_0701, ^WIFI_CONN_0902, WIFI_CONN_0902] diff --git a/components/test/TestCaseAll.yml b/components/test/TestCaseAll.yml index c5e10b794a..cf634005dd 100644 --- a/components/test/TestCaseAll.yml +++ b/components/test/TestCaseAll.yml @@ -2065,64 +2065,6 @@ test cases: test point 1: basic function test point 2: wifi connect status check version: v1 (2016-8-15) -- CI ready: 'Yes' - ID: WIFI_CONN_0701 - SDK: '8266_NonOS - - 8266_RTOS - - ESP32_IDF' - Test App: SSC - auto test: 'Yes' - category: Function - cmd set: - - '' - - - SSC SSC1 sta -D - - [R SSC1 C QAP] - - - SSC SSC1 sta -Q - - ['R SSC1 C +STA_STATUS:0'] - - - SSC SSC1 sta -C -s -p - - ['R SSC1 C +JAP:OK'] - - - SSC SSC1 sta -Q - - ['R SSC1 C +STA_STATUS:1', 'R SSC1 C +JAP:CONNECTED'] - - - SSC SSC1 sta -Q - - ['R SSC1 C +STA_STATUS:5'] - - - APC OFF - - [P PC_COM L OK, P SSC1 C bcn_timout] - - - SSC SSC1 sta -Q - - ['R SSC1 C +STA_STATUS:4'] - - - APC ON - - [P PC_COM L OK] - comment: '' - execution time: 0.0 - expected result: '1. idle state - - 2. connecting state - - 3. got IP state - - 4. connect fail state' - initial condition: STAM1 - initial condition description (auto): sta mode, quit AP, DHCP on, will autogen a - TC with initial condition STAAP1 - module: WIFI MAC - steps: '1. sta disconnected, query status - - 2. sta connect to AP, query status - - 3. got IP, query status - - 4. AP power off, query status when beacon timeout' - sub module: WIFI Connect - summary: check wifi status idle, connecting, got ip and connect fail - test environment: SSC_T1_APC - test environment description (auto): "PC has 1 wired NIC connected to AP.\nPC has\ - \ 1 wired NIC connected to APC (static IP within the same subnet with APC). \n\ - APC control AP power supply. \nPC has 1 WiFi NIC. \n1 SSC target connect with\ - \ PC by UART." - test point 1: basic function - test point 2: wifi connect status check - version: v1 (2016-8-15) - CI ready: 'Yes' ID: TCPIP_DNS_0102 SDK: '8266_NonOS @@ -2603,64 +2545,6 @@ test cases: test point 1: basic function test point 2: IGMP API parameter check version: v1 (2016-8-15) -- CI ready: 'Yes' - ID: ^WIFI_CONN_0701 - SDK: '8266_NonOS - - 8266_RTOS - - ESP32_IDF' - Test App: SSC - auto test: 'Yes' - category: Function - cmd set: - - '' - - - SSC SSC1 sta -D - - [R SSC1 C QAP] - - - SSC SSC1 sta -Q - - ['R SSC1 C +STA_STATUS:0'] - - - SSC SSC1 sta -C -s -p - - ['R SSC1 C +JAP:OK'] - - - SSC SSC1 sta -Q - - ['R SSC1 C +STA_STATUS:1', 'R SSC1 C +JAP:CONNECTED'] - - - SSC SSC1 sta -Q - - ['R SSC1 C +STA_STATUS:5'] - - - APC OFF - - [P PC_COM L OK, P SSC1 C bcn_timout] - - - SSC SSC1 sta -Q - - ['R SSC1 C +STA_STATUS:4'] - - - APC ON - - [P PC_COM L OK] - comment: '' - execution time: 0.0 - expected result: '1. idle state - - 2. connecting state - - 3. got IP state - - 4. connect fail state' - initial condition: STAAP1 - initial condition description (auto): testing sta on sta + ap mode, quit AP (autogen - by STAM1) - module: WIFI MAC - steps: '1. sta disconnected, query status - - 2. sta connect to AP, query status - - 3. got IP, query status - - 4. AP power off, query status when beacon timeout' - sub module: WIFI Connect - summary: check wifi status idle, connecting, got ip and connect fail - test environment: SSC_T1_APC - test environment description (auto): "PC has 1 wired NIC connected to AP.\nPC has\ - \ 1 wired NIC connected to APC (static IP within the same subnet with APC). \n\ - APC control AP power supply. \nPC has 1 WiFi NIC. \n1 SSC target connect with\ - \ PC by UART." - test point 1: basic function - test point 2: wifi connect status check - version: v1 (2016-8-15) - CI ready: 'Yes' ID: ^WIFI_CONN_0703 SDK: '8266_NonOS @@ -7985,46 +7869,6 @@ test cases: test point 1: basic function test point 2: wifi disconnect reason test version: v1 (2016-8-15) -- CI ready: 'Yes' - ID: ^WIFI_CONN_0902 - SDK: '8266_NonOS - - 8266_RTOS - - ESP32_IDF' - Test App: SSC - auto test: 'Yes' - category: Function - cmd set: - - '' - - - SSC SSC1 sta -C -s -p - - ['R SSC1 C +JAP:CONNECTED'] - - - APC OFF - - [P PC_COM L OK, 'R SSC1 C +JAP:DISCONNECTED,1,200'] - - - APC ON - - [P PC_COM L OK] - comment: '' - execution time: 0.0 - expected result: '1. succeed - - 2. disconnect event REASON_BEACON_TIMEOUT' - initial condition: STAAP1 - initial condition description (auto): testing sta on sta + ap mode, quit AP (autogen - by STAM1) - module: WIFI MAC - steps: '1. connect to AP - - 2. AP power off' - sub module: WIFI Connect - summary: test wifi disconnect reason REASON_BEACON_TIMEOUT - test environment: SSC_T1_APC - test environment description (auto): "PC has 1 wired NIC connected to AP.\nPC has\ - \ 1 wired NIC connected to APC (static IP within the same subnet with APC). \n\ - APC control AP power supply. \nPC has 1 WiFi NIC. \n1 SSC target connect with\ - \ PC by UART." - test point 1: basic function - test point 2: wifi disconnect reason test - version: v1 (2016-8-15) - CI ready: 'Yes' ID: ^WIFI_CONN_0901 SDK: '8266_NonOS @@ -12218,46 +12062,6 @@ test cases: test point 1: basic function test point 2: wifi disconnect reason test version: v1 (2016-8-15) -- CI ready: 'Yes' - ID: WIFI_CONN_0902 - SDK: '8266_NonOS - - 8266_RTOS - - ESP32_IDF' - Test App: SSC - auto test: 'Yes' - category: Function - cmd set: - - '' - - - SSC SSC1 sta -C -s -p - - ['R SSC1 C +JAP:CONNECTED'] - - - APC OFF - - [P PC_COM L OK, 'R SSC1 C +JAP:DISCONNECTED,1,200'] - - - APC ON - - [P PC_COM L OK] - comment: '' - execution time: 0.0 - expected result: '1. succeed - - 2. disconnect event REASON_BEACON_TIMEOUT' - initial condition: STAM1 - initial condition description (auto): sta mode, quit AP, DHCP on, will autogen a - TC with initial condition STAAP1 - module: WIFI MAC - steps: '1. connect to AP - - 2. AP power off' - sub module: WIFI Connect - summary: test wifi disconnect reason REASON_BEACON_TIMEOUT - test environment: SSC_T1_APC - test environment description (auto): "PC has 1 wired NIC connected to AP.\nPC has\ - \ 1 wired NIC connected to APC (static IP within the same subnet with APC). \n\ - APC control AP power supply. \nPC has 1 WiFi NIC. \n1 SSC target connect with\ - \ PC by UART." - test point 1: basic function - test point 2: wifi disconnect reason test - version: v1 (2016-8-15) - CI ready: 'Yes' ID: TCPIP_ARP_0203 SDK: '8266_NonOS diff --git a/components/test/TestEnvAll.yml b/components/test/TestEnvAll.yml index 703fafcb60..a978f5f73a 100644 --- a/components/test/TestEnvAll.yml +++ b/components/test/TestEnvAll.yml @@ -97,7 +97,7 @@ test environment: Multimeter connect to input, able to measure input voltage. 1 SSC target connect with PC by UART.', test script: EnvBase} -- {PC OS: '', Special: N, Target Count: 1.0, script path: EnvBase.py, tag: SSC_T1_APC, +- {PC OS: '', Special: Y, Target Count: 1.0, script path: EnvBase.py, tag: SSC_T1_APC, test environment detail: "PC has 1 wired NIC connected to AP.\nPC has 1 wired NIC\ \ connected to APC (static IP within the same subnet with APC). \nAPC control\ \ AP power supply. \nPC has 1 WiFi NIC. \n1 SSC target connect with PC by UART.",