Slightly alter some tests to work with versions of python on ubuntu 10.04

diff --git a/htsworkflow/frontend/samples/tests.py b/htsworkflow/frontend/samples/tests.py
index 18f6e9843872f345e2a25c7263b3f58a36de020b..b6e8f9893f12b8d7f33d4a9c23822cf56fdfb22c 100644 (file)
--- a/htsworkflow/frontend/samples/tests.py
+++ b/htsworkflow/frontend/samples/tests.py
@@ -169,8 +169,6 @@ except ImportError,e:
     HAVE_RDF = False
 
     
-@unittest.skipIf(not HAVE_RDF,
-                 'Install python librdf to test RDFa encoded in pages')
 class TestRDFaLibrary(TestCase):
     fixtures = ['test_samples.json']
 

diff --git a/htsworkflow/submission/test/test_daf.py b/htsworkflow/submission/test/test_daf.py
index b71e36272083625cf291096ee227ad5292272d9d..cefc78f1541c05247058e146b7bbbd83b1e60c78 100644 (file)
--- a/htsworkflow/submission/test/test_daf.py
+++ b/htsworkflow/submission/test/test_daf.py
@@ -68,8 +68,8 @@ class TestDAF(unittest.TestCase):
         writer = get_serializer()
         turtle =  writer.serialize_model_to_string(model)
         #print turtle
-        
-        self.failUnless(str(signal_view_node) in turtle)
+
+        self.failUnless(str(signal_view_node.uri) in turtle)
 
         statements = list(model.find_statements(
             RDF.Statement(
@@ -175,9 +175,9 @@ class TestDAFMapper(unittest.TestCase):
         
         daf_mapper.construct_file_attributes('/tmp/analysis1', libNode, 'filename.bam')
         source = daf_mapper.model.get_source(rdfNS['type'], submissionOntology['submission'])
-        self.failUnlessEqual(str(source), "<http://jumpgate.caltech.edu/wiki/SubmissionsLog/testfind/analysis1>")
+        self.failUnlessEqual(str(source.uri), "http://jumpgate.caltech.edu/wiki/SubmissionsLog/testfind/analysis1")
         view = daf_mapper.model.get_target(source, submissionOntology['has_view'])
-        self.failUnlessEqual(str(view), "<http://jumpgate.caltech.edu/wiki/SubmissionsLog/testfind/view/Signal>")
+        self.failUnlessEqual(str(view.uri), "http://jumpgate.caltech.edu/wiki/SubmissionsLog/testfind/view/Signal")
 
 def suite():
     suite = unittest.makeSuite(TestDAF, 'test')