Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump lighty.io core and add tests support for it
[transportpce.git]
/
tests
/
transportpce_tests
/
1.2.1
/
test_pce.py
diff --git
a/tests/transportpce_tests/1.2.1/test_pce.py
b/tests/transportpce_tests/1.2.1/test_pce.py
index 15b3d3cc882b54dbfedf600a3ccf17e61bde18f6..3b3cf13e6c02230cd2c2703add4487421d83b97c 100644
(file)
--- a/
tests/transportpce_tests/1.2.1/test_pce.py
+++ b/
tests/transportpce_tests/1.2.1/test_pce.py
@@
-17,6
+17,7
@@
import shutil
import subprocess
import time
import unittest
import subprocess
import time
import unittest
+import test_utils
class TransportPCEtesting(unittest.TestCase):
class TransportPCEtesting(unittest.TestCase):
@@
-42,19
+43,13
@@
class TransportPCEtesting(unittest.TestCase):
with open(topo_uni_dir_complex_file, 'r') as topo_uni_dir_complex:
cls.complex_topo_uni_dir_data = topo_uni_dir_complex.read();
with open(topo_uni_dir_complex_file, 'r') as topo_uni_dir_complex:
cls.complex_topo_uni_dir_data = topo_uni_dir_complex.read();
- @classmethod
- def __start_odl(cls):
- executable = "../karaf/target/assembly/bin/karaf"
- with open('odl.log', 'w') as outfile:
- cls.odl_process = subprocess.Popen(
- ["bash", executable, "server"], stdout=outfile,
- stdin=open(os.devnull))
-
@classmethod
def setUpClass(cls): # a class method called before tests in an individual class run.
cls._get_file()
@classmethod
def setUpClass(cls): # a class method called before tests in an individual class run.
cls._get_file()
- cls.__start_odl()
+ print ("starting opendaylight...")
+ cls.odl_process = test_utils.start_tpce()
time.sleep(90)
time.sleep(90)
+ print ("opendaylight started")
@classmethod
def tearDownClass(cls):
@classmethod
def tearDownClass(cls):