X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=blobdiff_plain;f=htsworkflow%2Ffrontend%2Fsamples%2Ftests.py;h=5f6b7a4638800514ed5d6f46433908ff8736c041;hp=f8eaf0ff0fe11e016df65f0d47586d880fab5979;hb=3d72e1d85b0153a3ed9bc454826fb2fe7b817efa;hpb=7d34fa0d67a0aa883d8c1f1af20a131f856ad533 diff --git a/htsworkflow/frontend/samples/tests.py b/htsworkflow/frontend/samples/tests.py index f8eaf0f..5f6b7a4 100644 --- a/htsworkflow/frontend/samples/tests.py +++ b/htsworkflow/frontend/samples/tests.py @@ -19,6 +19,7 @@ from htsworkflow.frontend.samples.views import \ library_json from htsworkflow.frontend.auth import apidata +from htsworkflow.util.conversion import unicode_or_none # The django test runner flushes the database between test suites not cases, # so to be more compatible with running via nose we flush the database tables @@ -139,8 +140,8 @@ class SampleWebTestCase(TestCase): #self.failUnlessEqual(d['amplified_from_sample'], lib.amplified_from_sample) self.failUnlessEqual(d['antibody_id'], lib.antibody_id) self.failUnlessEqual(d['avg_lib_size'], lib.avg_lib_size) - self.failUnlessEqual(d['cell_line'], lib.cell_line.cellline_name) self.failUnlessEqual(d['cell_line_id'], lib.cell_line_id) + self.failUnlessEqual(d['cell_line'], unicode_or_none(lib.cell_line)) self.failUnlessEqual(d['experiment_type'], lib.experiment_type.name) self.failUnlessEqual(d['experiment_type_id'], lib.experiment_type_id) self.failUnlessEqual(d['id'], lib.id)