From fb27343dc571a64a0690badae85a85ef101c0090 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Mon, 17 Jun 2019 11:47:47 +0200 Subject: [PATCH] enable -1 voting in topoPortmapping and E2E tests topoPortmapping and E2E include expected failures in some tests. This change - adds a unittest.expectedFailure decorator to the tests unit expected to fail. This way the test suite will return success even if they fail. - enables topoPortmapping and E2E tests failure reports to Jenkins. Change-Id: I679526af0afb01ba08b57a726ff137ff3431916d JIRA: TRNSPRTPCE-129 Signed-off-by: guillaume.lambert --- tests/transportpce_tests/1.2.1/test_topoPortMapping.py | 1 + tests/transportpce_tests/2.2.1/test_end2end.py | 2 ++ tox.ini | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/transportpce_tests/1.2.1/test_topoPortMapping.py b/tests/transportpce_tests/1.2.1/test_topoPortMapping.py index a772a9109..f941846ca 100644 --- a/tests/transportpce_tests/1.2.1/test_topoPortMapping.py +++ b/tests/transportpce_tests/1.2.1/test_topoPortMapping.py @@ -222,6 +222,7 @@ class TransportPCEtesting(unittest.TestCase): time.sleep(15) #Verify the termination points related to XPDR + @unittest.expectedFailure def test_05_compareOpenroadmTopologyPortMapping(self): nbXPDR=1 for p in(1,nbXPDR+1): diff --git a/tests/transportpce_tests/2.2.1/test_end2end.py b/tests/transportpce_tests/2.2.1/test_end2end.py index 6f0edf287..a5c9de321 100644 --- a/tests/transportpce_tests/2.2.1/test_end2end.py +++ b/tests/transportpce_tests/2.2.1/test_end2end.py @@ -1472,6 +1472,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.test_32_check_topo_ROADMA_SRG1() self.test_33_check_topo_ROADMA_DEG2() + @unittest.expectedFailure def test_47_loop_create_eth_service(self): for i in range(1,6): print ("trial number {}".format(i)) @@ -1484,6 +1485,7 @@ class TransportPCEFulltesting(unittest.TestCase): print ("eth service deletion\n") self.test_28_delete_eth_service1() + @unittest.expectedFailure def test_48_loop_create_oc_service(self): url = ("{}/operational/org-openroadm-service:service-list/services/service1" .format(self.restconf_baseurl)) diff --git a/tox.ini b/tox.ini index cb0addf4c..9bcaf4fb8 100644 --- a/tox.ini +++ b/tox.ini @@ -20,7 +20,7 @@ commands = {py27,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,olm221,end2end221}: - bash -c "(cd .. && mvn clean install -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true)" {py27,portmapping,topoPortMapping,rspn,topology,olm,end2end}: - ./buildHoneynode.sh {py27,portmapping}: nosetests --with-xunit transportpce_tests/1.2.1/test_portmapping.py - {py27,topoPortMapping}: - nosetests --with-xunit transportpce_tests/1.2.1/test_topoPortMapping.py + {py27,topoPortMapping}: nosetests --with-xunit transportpce_tests/1.2.1/test_topoPortMapping.py {py27,topology}: nosetests --with-xunit transportpce_tests/1.2.1/test_topology.py {py27,rspn}: nosetests --with-xunit transportpce_tests/1.2.1/test_renderer_service_path_nominal.py {py27,pce}: nosetests --with-xunit transportpce_tests/1.2.1/test_pce.py @@ -31,7 +31,7 @@ commands = {py27,topology221}: nosetests --with-xunit transportpce_tests/2.2.1/test_topology.py {py27,rspn221}: nosetests --with-xunit transportpce_tests/2.2.1/test_renderer_service_path_nominal.py {py27,olm221}: nosetests --with-xunit transportpce_tests/2.2.1/test_olm.py - {py27,end2end221}: - nosetests --with-xunit transportpce_tests/2.2.1/test_end2end.py + {py27,end2end221}: nosetests --with-xunit transportpce_tests/2.2.1/test_end2end.py [testenv:docs] -- 2.36.6