Removing warnings from tests:

Author: josenavas

qiita_db/test/test_analysis.py

@@ -182,9 +182,9 @@ def test_retrieve_dropped_samples(self):
             "lab_person_id": StudyPerson(1)
         }
         metadata_dict = {
-            'SKB8.640193': {'physical_location': 'location1',
-                            'has_physical_specimen': True,
-                            'has_extracted_data': True,
+            'SKB8.640193': {'physical_specimen_location': 'location1',
+                            'physical_specimen_remaining': True,
+                            'dna_extracted': True,
                             'sample_type': 'type1',
                             'required_sample_info_status': 'received',
                             'collection_timestamp':
@@ -194,9 +194,9 @@ def test_retrieve_dropped_samples(self):
                             'str_column': 'Value for sample 1',
                             'latitude': 42.42,
                             'longitude': 41.41},
-            'SKD8.640184': {'physical_location': 'location1',
-                            'has_physical_specimen': True,
-                            'has_extracted_data': True,
+            'SKD8.640184': {'physical_specimen_location': 'location1',
+                            'physical_specimen_remaining': True,
+                            'dna_extracted': True,
                             'sample_type': 'type1',
                             'required_sample_info_status': 'received',
                             'collection_timestamp':
@@ -206,9 +206,9 @@ def test_retrieve_dropped_samples(self):
                             'str_column': 'Value for sample 2',
                             'latitude': 4.2,
                             'longitude': 1.1},
-            'SKB7.640196': {'physical_location': 'location1',
-                            'has_physical_specimen': True,
-                            'has_extracted_data': True,
+            'SKB7.640196': {'physical_specimen_location': 'location1',
+                            'physical_specimen_remaining': True,
+                            'dna_extracted': True,
                             'sample_type': 'type1',
                             'required_sample_info_status': 'received',
                             'collection_timestamp':

qiita_db/test/test_commands.py

@@ -723,8 +723,9 @@ def test_update_preprocessed_data_from_cmd_ppd(self):
 
 SAMPLE_TEMPLATE = (
     "sample_name\trequired_sample_info_status\tcollection_timestamp\t"
-    "sample_type\thas_physical_specimen\tphysical_location\thas_extracted_data"
-    "\thost_subject_id\tTreatment\tDOB\tlatitude\tlongitude\tDescription\n"
+    "sample_type\tphysical_specimen_remaining\tphysical_specimen_location\t"
+    "dna_extracted\thost_subject_id\tTreatment\tDOB\tlatitude\tlongitude"
+    "\tDescription\n"
     "PC.354\treceived\t2014-06-18 16:44\ttype_1\tTrue\tLocation_1\tTrue\t"
     "HS_ID_PC.354\tControl\t20061218\t1.88401499993\t56.0003871552\t"
     "Control_mouse_I.D._354\n"
@@ -739,8 +740,8 @@ def test_update_preprocessed_data_from_cmd_ppd(self):
     "Fasting_mouse_I.D._636")
 
 PREP_TEMPLATE = (
-    'sample_name\tbarcodesequence\tcenter_name\tcenter_project_name\t'
-    'description\tebi_submission_accession\temp_status\tlinkerprimersequence\t'
+    'sample_name\tbarcode\tcenter_name\tcenter_project_name\t'
+    'description\tebi_submission_accession\temp_status\tprimer\t'
     'run_prefix\tstr_column\tplatform\tlibrary_construction_protocol\t'
     'experiment_design_description\n'
     'SKB7.640196\tCCTCTGAGAGCT\tANL\tTest Project\tskb7\tNone\tEMP\t'