Commits

Daniel Blankenberg  committed 7e21563

Fix for Biomart test. Why are there two biomart tests?

  • Participants
  • Parent commits fe0309e

Comments (0)

Files changed (2)

File test/functional/test_3A_GetData.py

 
     def test_30_Biomart_Uniprot(self):
         """3A_GetData: Connection to Biomart"""
+        #All this test does, is check to see if biomart is accessible through Galaxy. A dataset is never retrieved or checked.
 
         # some button indices are hardcoded (twill limitation)
         self.run_tool('biomart')
         
-        self.submit_form(form='settings', button='stage_filter', 
-            database='UNIPROTPROTOTYPE4-5(EBI)__default', dataset='uniprot'
+        self.submit_form(form='mainform', button='get_count_button', 
+            dataBase='default____UNIPROT PROTOTYPE 4-5  (EBI)', dataset='uniprot'
         )
         
-        self.submit_form(form='settings', button=6, 
-            uniprot_collection_start=1, uniprot_collection_end=1,
-            uniprot_component_start=1000, uniprot_component_end=2000
-        )
+        #self.submit_form(form='settings', button='stage_filter', 
+        #    database='UNIPROTPROTOTYPE4-5(EBI)__default', dataset='uniprot'
+        #)
+        
+        #self.submit_form(form='settings', button=6, 
+        #    uniprot_collection_start=1, uniprot_collection_end=1,
+        #    uniprot_component_start=1000, uniprot_component_end=2000
+        #)
         
         #self.submit_form(form='settings', button=5, 
         #    outtype='Features', outformat='tsv'

File test/functional/test_datasource_tools.py

 
     def test_Biomart_Uniprot(self):
         """Connection to Biomart"""
+        #All this test does, is check to see if biomart is accessible through Galaxy. A dataset is never retrieved or checked.
 
         # some button indices are hardcoded (twill limitation)
         self.run_tool('biomart')
         
-        self.submit_form(form='settings', button='stage_filter', 
-            database='UNIPROTPROTOTYPE4-5(EBI)__default', dataset='uniprot'
+        self.submit_form(form='mainform', button='get_count_button', 
+            dataBase='default____UNIPROT PROTOTYPE 4-5  (EBI)', dataset='uniprot'
         )
         
-        self.submit_form(form='settings', button=6, 
-            uniprot_collection_start=1, uniprot_collection_end=1,
-            uniprot_component_start=1000, uniprot_component_end=2000
-        )
+        #self.submit_form(form='settings', button='stage_filter', 
+        #    database='UNIPROTPROTOTYPE4-5(EBI)__default', dataset='uniprot'
+        #)
+        
+        #self.submit_form(form='settings', button=6, 
+        #    uniprot_collection_start=1, uniprot_collection_end=1,
+        #    uniprot_component_start=1000, uniprot_component_end=2000
+        #)
         
         #self.submit_form(form='settings', button=5, 
         #    outtype='Features', outformat='tsv'