From a68cfed833d336ed1b89779951e1cf99851e6928 Mon Sep 17 00:00:00 2001 From: Diane Trout Date: Wed, 22 Jun 2011 15:07:12 -0700 Subject: [PATCH] Slightly alter some tests to work with versions of python on ubuntu 10.04 --- htsworkflow/frontend/samples/tests.py | 2 -- htsworkflow/submission/test/test_daf.py | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/htsworkflow/frontend/samples/tests.py b/htsworkflow/frontend/samples/tests.py index 18f6e98..b6e8f98 100644 --- 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 b71e362..cefc78f 100644 --- 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), "") + 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), "") + self.failUnlessEqual(str(view.uri), "http://jumpgate.caltech.edu/wiki/SubmissionsLog/testfind/view/Signal") def suite(): suite = unittest.makeSuite(TestDAF, 'test') -- 2.30.2