diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2016-10-26 09:41:19 +0200 |
---|---|---|
committer | Morgan Richomme <morgan.richomme@orange.com> | 2016-11-04 12:22:07 +0000 |
commit | d3042a7aa885d7761289661fb728f4d7b5e7c94b (patch) | |
tree | a51364c06ea2db19a7e3b64b36160bd67b3d127c /testcases/Controllers/ODL/OpenDaylightTesting.py | |
parent | 82f18a401cee8c6f4a2395c6185052c2fcd0ba16 (diff) |
Delete the reachability tests
It removes 001__reachability.robot as it is now part of OpenDaylight
integration/test. It completes the commit which pushes upstream the
reachability tests [1].
[1] https://git.opendaylight.org/gerrit/#/c/46910/
Change-Id: I72926cd4ab77e12ba4aeabf03bdd35619d43ffd3
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'testcases/Controllers/ODL/OpenDaylightTesting.py')
-rwxr-xr-x | testcases/Controllers/ODL/OpenDaylightTesting.py | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/testcases/Controllers/ODL/OpenDaylightTesting.py b/testcases/Controllers/ODL/OpenDaylightTesting.py index c44be626c..8c003abfd 100755 --- a/testcases/Controllers/ODL/OpenDaylightTesting.py +++ b/testcases/Controllers/ODL/OpenDaylightTesting.py @@ -12,7 +12,6 @@ import errno import fileinput import os import re -import shutil import sys import urlparse @@ -60,19 +59,6 @@ class ODLTestCases(TestCasesBase.TestCasesBase): self.case_name = "odl" @classmethod - def copy_opnf_testcases(cls): - opnfv_testcases_dir = (os.path.dirname(os.path.abspath(__file__)) + - "/custom_tests/neutron/") - f = opnfv_testcases_dir + "001__reachability.robot" - try: - shutil.copy(f, cls.neutron_suite_dir) - except IOError as e: - cls.logger.error( - "Cannot copy OPNFV's testcase to ODL directory: %s" % str(e)) - return False - return True - - @classmethod def set_robotframework_vars(cls, odlusername="admin", odlpassword="admin"): odl_variables_files = cls.odl_test_repo + 'csit/variables/Variables.py' try: @@ -115,8 +101,7 @@ class ODLTestCases(TestCasesBase.TestCasesBase): self.logger.error("Cannot run ODL testcases. Please check " "%s" % str(e)) return self.EX_RUN_ERROR - if (self.copy_opnf_testcases() and - self.set_robotframework_vars(odlusername, odlpassword)): + if self.set_robotframework_vars(odlusername, odlpassword): try: os.makedirs(self.res_dir) except OSError as e: |