Merge branch 'speedup-metadata-tests' into unify-metadata-creation

Author: josenavas

qiita_db/metadata_template/test/test_prep_template.py

@@ -35,7 +35,7 @@
 from qiita_db.metadata_template.sample_template import SampleTemplate, Sample
 
 
-class SetUpTestPrepSample(TestCase):
+class BaseTestPrepSample(TestCase):
     def setUp(self):
         self.prep_template = PrepTemplate(1)
         self.sample_id = '1.SKB8.640193'
@@ -52,7 +52,7 @@ def setUp(self):
                                'sample_center', 'pcr_primers', 'study_center'}
 
 
-class TestPrepSampleReadOnly(SetUpTestPrepSample):
+class TestPrepSampleReadOnly(BaseTestPrepSample):
     def test_init_unknown_error(self):
         """Init errors if the PrepSample id is not found in the template"""
         with self.assertRaises(QiitaDBUnknownIDError):
@@ -217,7 +217,7 @@ def test_get_none(self):
 
 
 @qiita_test_checker()
-class TestPrepSampleReadWrite(SetUpTestPrepSample):
+class TestPrepSampleReadWrite(BaseTestPrepSample):
     """Tests the PrepSample class"""
     def test_setitem(self):
         """setitem raises an error (currently not allowed)"""
@@ -230,7 +230,7 @@ def test_delitem(self):
             del self.tester['pcr_primers']
 
 
-class SetUpTestPrepTemplate(TestCase):
+class BaseTestPrepTemplate(TestCase):
     def _set_up(self):
         self.metadata_dict = {
             'SKB8.640193': {'center_name': 'ANL',
@@ -330,7 +330,7 @@ def tearDown(self):
             remove(f)
 
 
-class TestPrepTemplateReadOnly(SetUpTestPrepTemplate):
+class TestPrepTemplateReadOnly(BaseTestPrepTemplate):
     def setUp(self):
         self._set_up()
 
@@ -623,7 +623,7 @@ def test_add_common_creation_steps_to_queue(self):
 
 
 @qiita_test_checker()
-class TestPrepTemplateReadWrite(SetUpTestPrepTemplate):
+class TestPrepTemplateReadWrite(BaseTestPrepTemplate):
     """Tests the PrepTemplate class"""
 
     def setUp(self):

qiita_db/metadata_template/test/test_sample_template.py

@@ -32,7 +32,7 @@
 from qiita_db.metadata_template.prep_template import PrepTemplate, PrepSample
 
 
-class SetUpTestSample(TestCase):
+class BaseTestSample(TestCase):
     def setUp(self):
         self.sample_template = SampleTemplate(1)
         self.sample_id = '1.SKB8.640193'
@@ -51,7 +51,7 @@ def setUp(self):
                                'env_feature', 'latitude', 'longitude'}
 
 
-class TestSampleReadOnly(SetUpTestSample):
+class TestSampleReadOnly(BaseTestSample):
     def test_init_unknown_error(self):
         """Init raises an error if the sample id is not found in the template
         """
@@ -204,7 +204,7 @@ def test_get_none(self):
 
 
 @qiita_test_checker()
-class TestSampleReadWrite(SetUpTestSample):
+class TestSampleReadWrite(BaseTestSample):
     def test_setitem(self):
         with self.assertRaises(QiitaDBColumnError):
             self.tester['column that does not exist'] = 0.30
@@ -218,7 +218,7 @@ def test_delitem(self):
             del self.tester['DEPTH']
 
 
-class SetUpTestSampleTemplate(TestCase):
+class BaseTestSampleTemplate(TestCase):
     def _set_up(self):
         self.metadata_dict = {
             'Sample1': {'physical_location': 'location1',
@@ -552,7 +552,7 @@ def tearDown(self):
             remove(f)
 
 
-class TestSampleTemplateReadOnly(SetUpTestSampleTemplate):
+class TestSampleTemplateReadOnly(BaseTestSampleTemplate):
     def setUp(self):
         self._set_up()
 
@@ -846,7 +846,7 @@ def test_add_common_creation_steps_to_queue(self):
 
 
 @qiita_test_checker()
-class TestSampleTemplateReadWrite(SetUpTestSampleTemplate):
+class TestSampleTemplateReadWrite(BaseTestSampleTemplate):
     """Tests the SampleTemplate class"""
 
     def setUp(self):