From: Diane Trout <diane@ghic.org>
Date: Tue, 17 Dec 2013 19:20:03 +0000 (-0800)
Subject: Merge branch 'django1.4'
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=125a2f05ae50945b0bd7c9f878de885c91f213eb

Merge branch 'django1.4'

there was a conflict with my qualifying the load_pipeline_run_xml function call

Conflicts:
	htsworkflow/frontend/samples/views.py
---

125a2f05ae50945b0bd7c9f878de885c91f213eb
diff --cc htsworkflow/pipelines/test/test_runfolder_rta180.py
index eacae8c,0db7857..2817328
--- a/htsworkflow/pipelines/test/test_runfolder_rta180.py
+++ b/htsworkflow/pipelines/test/test_runfolder_rta180.py
@@@ -271,9 -271,9 +271,10 @@@ class RunfolderTests(TestCase)
          runs = runfolder.get_runs(self.runfolder_dir)
          self.failUnlessEqual(len(runs), 1)
          name = 'run_207BTAAXY_%s.xml' % ( date.today().strftime('%Y-%m-%d'),)
-         self.failUnlessEqual(runs[0].name, name)
+         self.failUnlessEqual(runs[0].serialization_filename, name)
+ 
  
 +
          r1 = runs[0]
          xml = r1.get_elements()
          xml_str = ElementTree.tostring(xml)