X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=blobdiff_plain;f=htsworkflow%2Fpipelines%2Ftest%2Ftest_run_xml.py;fp=htsworkflow%2Fpipelines%2Ftest%2Ftest_run_xml.py;h=d6530d9866f785a2ca33c083504f37d8a7f5051d;hp=8b28b9e9cc88eb34d687865fc6ad5b78a1a4a19c;hb=53ebb47e86e81ce349d4ef4e16aef94be93486ea;hpb=4262586d10cc0cc227390873b301b55244204c11

diff --git a/htsworkflow/pipelines/test/test_run_xml.py b/htsworkflow/pipelines/test/test_run_xml.py
index 8b28b9e..d6530d9 100644
--- a/htsworkflow/pipelines/test/test_run_xml.py
+++ b/htsworkflow/pipelines/test/test_run_xml.py
@@ -1,8 +1,8 @@
 import os
-from unittest2 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
@@ -24,8 +24,8 @@ class testLoadRunXML(TestCase):
         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 lane_results.items():
+        for (end, lane), lane_results in list(results['lane_results'].items()):
+            for name, test_value in list(lane_results.items()):
                 xml_value = getattr(run.gerald.summary[end][lane], name)
 
                 self.failUnlessEqual(xml_value, test_value,
@@ -97,12 +97,12 @@ class testLoadRunXML(TestCase):
 
 
 def suite():
-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testLoadRunXML))
     return suite
 
 
 if __name__ == "__main__":
-    from unittest2 import main
+    from unittest import main
     main(defaultTest="suite")