#40 correction or modification of tests

nansencenter · Sep 29, 2020 · 2b17e92 · 2b17e92
1 parent c216a34
commit 2b17e92
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/tests/test_crawlers.py b/tests/test_crawlers.py
@@ -609,7 +609,7 @@ class FTPCrawlerTestCase(unittest.TestCase):
     def emulate_cwd_of_ftp(self, name):
         """passes in the case of "", ".." or "folder_name" in order to resemble the behavior of cwd
         of ftplib. Otherwise (encountering a filename) raise the proper exception """
-        if name not in ["..", "folder_name", ""]:
+        if name not in ("..", "folder_name", ""):
             raise ftplib.error_perm
 
     @mock.patch('geospaas_harvesting.crawlers.ftplib.FTP', autospec=True)

diff --git a/tests/test_ingesters.py b/tests/test_ingesters.py
@@ -720,9 +720,9 @@ def test_function_get_normalized_attributes_ceda(self):
         ingester = ingesters.URLNameIngester()
         normalized_attributes = ingester._get_normalized_attributes(input_url)
         self.assertCountEqual(list(normalized_attributes.keys()),
-                              ingester.DATASET_CUMULATIVE_PARAMETER_NAMES +
-                              ingester.DATASET_PARAMETER_NAMES +
-                              ['geospaas_service_name', 'geospaas_service', 'entry_id'])
+                              ingester.DATASET_CUMULATIVE_PARAMETER_NAMES.union(
+                              ingester.DATASET_PARAMETER_NAMES).union(
+                              {'geospaas_service_name', 'geospaas_service', 'entry_id'}))
         self.assertNotIn(None, normalized_attributes.values())
 
     def test_function_get_normalized_attributes_remss(self):
@@ -734,9 +734,9 @@ def test_function_get_normalized_attributes_remss(self):
         ingester = ingesters.URLNameIngester()
         normalized_attributes = ingester._get_normalized_attributes(input_url)
         self.assertCountEqual(list(normalized_attributes.keys()),
-                              ingester.DATASET_CUMULATIVE_PARAMETER_NAMES +
-                              ingester.DATASET_PARAMETER_NAMES +
-                              ['geospaas_service_name', 'geospaas_service', 'entry_id'])
+                              ingester.DATASET_CUMULATIVE_PARAMETER_NAMES.union(
+                              ingester.DATASET_PARAMETER_NAMES).union(
+                              {'geospaas_service_name', 'geospaas_service', 'entry_id'}))
         self.assertNotIn(None, normalized_attributes.values())
 
     def test_function_get_normalized_attributes_jaxa(self):
@@ -748,9 +748,9 @@ def test_function_get_normalized_attributes_jaxa(self):
         ingester = ingesters.URLNameIngester()
         normalized_attributes = ingester._get_normalized_attributes(input_url)
         self.assertCountEqual(list(normalized_attributes.keys()),
-                              ingester.DATASET_CUMULATIVE_PARAMETER_NAMES +
-                              ingester.DATASET_PARAMETER_NAMES +
-                              ['geospaas_service_name', 'geospaas_service', 'entry_id'])
+                              ingester.DATASET_CUMULATIVE_PARAMETER_NAMES.union(
+                              ingester.DATASET_PARAMETER_NAMES).union(
+                              {'geospaas_service_name', 'geospaas_service', 'entry_id'}))
         self.assertNotIn(None, normalized_attributes.values())