From: Diane Trout Date: Mon, 7 Nov 2011 23:42:39 +0000 (-0800) Subject: Use Node.uri instead of manually trimming off RDF.Node formatting. X-Git-Tag: v0.5.5~79 X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=ef361ca5766a5d91d95533433605695b7fbc4d8c Use Node.uri instead of manually trimming off RDF.Node formatting. (Because different versions of librdf format nodes diffrently. --- diff --git a/htsworkflow/submission/test/test_daf.py b/htsworkflow/submission/test/test_daf.py index 8b16312..b730144 100644 --- a/htsworkflow/submission/test/test_daf.py +++ b/htsworkflow/submission/test/test_daf.py @@ -198,7 +198,7 @@ thisView:FastqRd1 dafTerm:filename_re ".*_r1\\\\.fastq" . # dump_model(daf_mapper.model) view_root = 'http://jumpgate.caltech.edu/wiki/SubmissionsLog/{0}/view/' view_root = view_root.format(name) - self.failUnlessEqual(str(view)[1:-1], + self.failUnlessEqual(str(view.uri), '{0}{1}'.format(view_root,'FastqRd1')) def test_find_overlapping_view(self):