projects
/
htsworkflow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial port to python3
[htsworkflow.git]
/
htsworkflow
/
pipelines
/
test
/
test_run_xml.py
diff --git
a/htsworkflow/pipelines/test/test_run_xml.py
b/htsworkflow/pipelines/test/test_run_xml.py
index 8b28b9e9cc88eb34d687865fc6ad5b78a1a4a19c..d6530d9866f785a2ca33c083504f37d8a7f5051d 100644
(file)
--- a/
htsworkflow/pipelines/test/test_run_xml.py
+++ b/
htsworkflow/pipelines/test/test_run_xml.py
@@
-1,8
+1,8
@@
import os
import os
-from unittest
2
import TestCase
-from
StringIO
import StringIO
+from unittest import TestCase
+from
io
import StringIO
-from simulate_runfolder import TESTDATA_DIR
+from
.
simulate_runfolder import TESTDATA_DIR
from htsworkflow.pipelines.runfolder import load_pipeline_run_xml
from htsworkflow.pipelines.eland import SampleKey
from htsworkflow.pipelines.runfolder import load_pipeline_run_xml
from htsworkflow.pipelines.eland import SampleKey
@@
-24,8
+24,8
@@
class testLoadRunXML(TestCase):
self.failUnlessEqual(run.runfolder_name, runfolder_name)
self.failUnlessEqual(run.gerald.runfolder_name, runfolder_name)
self.failUnlessEqual(run.runfolder_name, runfolder_name)
self.failUnlessEqual(run.gerald.runfolder_name, runfolder_name)
- for (end, lane), lane_results in
results['lane_results'].items(
):
- for name, test_value in l
ane_results.items(
):
+ for (end, lane), lane_results in
list(results['lane_results'].items()
):
+ for name, test_value in l
ist(lane_results.items()
):
xml_value = getattr(run.gerald.summary[end][lane], name)
self.failUnlessEqual(xml_value, test_value,
xml_value = getattr(run.gerald.summary[end][lane], name)
self.failUnlessEqual(xml_value, test_value,
@@
-97,12
+97,12
@@
class testLoadRunXML(TestCase):
def suite():
def suite():
- from unittest
2
import TestSuite, defaultTestLoader
+ from unittest import TestSuite, defaultTestLoader
suite = TestSuite()
suite.addTests(defaultTestLoader.loadTestsFromTestCase(testLoadRunXML))
return suite
if __name__ == "__main__":
suite = TestSuite()
suite.addTests(defaultTestLoader.loadTestsFromTestCase(testLoadRunXML))
return suite
if __name__ == "__main__":
- from unittest
2
import main
+ from unittest import main
main(defaultTest="suite")
main(defaultTest="suite")