From c3e567bb33902ed8665df17231703c64a11bd70b Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Fri, 22 Mar 2019 10:17:03 +0100 Subject: [PATCH 1/2] CI: removing TDD 20MHz scenarios from CI test-suite temporarly Signed-off-by: Raphael Defosseux --- ...0mhz_tm1.xml => enb_usrp210_band40_test_20mhz_tm1_not_run.xml} | 0 ...test_20mhz.xml => if4p5_usrp210_band40_test_20mhz_not_run.xml} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename ci-scripts/xml_files/{enb_usrp210_band40_test_20mhz_tm1.xml => enb_usrp210_band40_test_20mhz_tm1_not_run.xml} (100%) rename ci-scripts/xml_files/{if4p5_usrp210_band40_test_20mhz.xml => if4p5_usrp210_band40_test_20mhz_not_run.xml} (100%) diff --git a/ci-scripts/xml_files/enb_usrp210_band40_test_20mhz_tm1.xml b/ci-scripts/xml_files/enb_usrp210_band40_test_20mhz_tm1_not_run.xml similarity index 100% rename from ci-scripts/xml_files/enb_usrp210_band40_test_20mhz_tm1.xml rename to ci-scripts/xml_files/enb_usrp210_band40_test_20mhz_tm1_not_run.xml diff --git a/ci-scripts/xml_files/if4p5_usrp210_band40_test_20mhz.xml b/ci-scripts/xml_files/if4p5_usrp210_band40_test_20mhz_not_run.xml similarity index 100% rename from ci-scripts/xml_files/if4p5_usrp210_band40_test_20mhz.xml rename to ci-scripts/xml_files/if4p5_usrp210_band40_test_20mhz_not_run.xml From 0ba1958e3991de12a8f06ba42d460a9f58033714 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Fri, 22 Mar 2019 11:59:22 +0100 Subject: [PATCH 2/2] CI: fix when XML file is missing during HtmlInit Signed-off-by: Raphael Defosseux --- ci-scripts/main.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ci-scripts/main.py b/ci-scripts/main.py index 70bfa1894f..dc101fe7ea 100644 --- a/ci-scripts/main.py +++ b/ci-scripts/main.py @@ -2542,14 +2542,19 @@ elif re.match('^InitiateHtml$', mode, re.IGNORECASE): Usage() sys.exit('Insufficient Parameter') count = 0 + foundCount = 0 while (count < SSH.nbTestXMLfiles): xml_test_file = sys.path[0] + "/" + SSH.testXMLfiles[count] - xmlTree = ET.parse(xml_test_file) - xmlRoot = xmlTree.getroot() - SSH.htmlTabRefs.append(xmlRoot.findtext('htmlTabRef',default='test-tab-' + str(count))) - SSH.htmlTabNames.append(xmlRoot.findtext('htmlTabName',default='Test-' + str(count))) - SSH.htmlTabIcons.append(xmlRoot.findtext('htmlTabIcon',default='info-sign')) + if (os.path.isfile(xml_test_file)): + xmlTree = ET.parse(xml_test_file) + xmlRoot = xmlTree.getroot() + SSH.htmlTabRefs.append(xmlRoot.findtext('htmlTabRef',default='test-tab-' + str(count))) + SSH.htmlTabNames.append(xmlRoot.findtext('htmlTabName',default='Test-' + str(count))) + SSH.htmlTabIcons.append(xmlRoot.findtext('htmlTabIcon',default='info-sign')) + foundCount += 1 count += 1 + if foundCount != SSH.nbTestXMLfiles: + SSH.nbTestXMLfiles = foundCount SSH.CreateHtmlHeader() elif re.match('^FinalizeHtml$', mode, re.IGNORECASE): SSH.CreateHtmlFooter(SSH.finalStatus)