Fixing sample template tests

Author: josenavas

qiita_db/metadata_template/test/test_sample_template.py

@@ -802,23 +802,20 @@ def test_add_common_creation_steps_to_queue(self):
 
         sql_insert_required = (
             'INSERT INTO qiita.required_sample_info '
-            '(study_id, sample_id, physical_location, has_physical_specimen, '
-            'has_extracted_data, sample_type, required_sample_info_status_id, '
-            'collection_timestamp, host_subject_id, description, latitude, '
-            'longitude) '
+            '(study_id, sample_id, collection_timestamp, description, '
+            'has_extracted_data, has_physical_specimen, host_subject_id, '
+            'latitude, longitude, physical_location, '
+            'required_sample_info_status_id, sample_type) '
             'VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)')
         sql_insert_required_params_1 = (
-            2, '2.Sample1', 'location1', True, True, 'type1', 1,
-            datetime(2014, 5, 29, 12, 24, 51), 'NotIdentified',
-            'Test Sample 1', 42.42, 41.41)
+            2, '2.Sample1', datetime(2014, 5, 29, 12, 24, 51), 'Test Sample 1',
+            True, True, 'NotIdentified', 42.42, 41.41, 'location1', 1, 'type1')
         sql_insert_required_params_2 = (
-            2, '2.Sample2', 'location1', True, True, 'type1', 1,
-            datetime(2014, 5, 29, 12, 24, 51), 'NotIdentified',
-            'Test Sample 2', 4.2, 1.1)
+            2, '2.Sample2', datetime(2014, 5, 29, 12, 24, 51), 'Test Sample 2',
+            True, True, 'NotIdentified', 4.2, 1.1, 'location1', 1, 'type1')
         sql_insert_required_params_3 = (
-            2, '2.Sample3', 'location1', True, True, 'type1', 1,
-            datetime(2014, 5, 29, 12, 24, 51), 'NotIdentified',
-            'Test Sample 3', 4.8, 4.41)
+            2, '2.Sample3', datetime(2014, 5, 29, 12, 24, 51), 'Test Sample 3',
+            True, True, 'NotIdentified', 4.8, 4.41, 'location1', 1, 'type1')
 
         sql_insert_sample_cols = (
             'INSERT INTO qiita.study_sample_columns '