revert

Author: Andrei Neagu

tests/integration/test_docker_image.py

@@ -18,7 +18,7 @@
 # HELPERS
 def _download_url(url: str, file: Path):
     # Download the file from `url` and save it locally under `file_name`:
-    with urllib.request.urlopen(url) as response, file.open("wb") as out_file:
+    with urllib.request.urlopen(url) as response, file.open('wb') as out_file:
         shutil.copyfileobj(response, out_file)
     assert file.exists()
 
@@ -36,20 +36,6 @@ def _convert_to_simcore_labels(image_labels: Dict) -> Dict:
     assert len(io_simcore_labels) > 0
     return io_simcore_labels
 
-
-def _is_url(value: str) -> bool:
-    """Check if the value is a URL."""
-    return isinstance(value, str) and (
-        value.startswith("http://") or value.startswith("https://")
-    )
-
-
-def _fetch_url_content(url: str) -> str:
-    """Fetch content from a URL."""
-    with urllib.request.urlopen(url) as response:
-        return response.read().decode("utf-8").strip()
-
-
 # FIXTURES
 @pytest.fixture
 def osparc_service_labels_jsonschema(tmp_path) -> Dict:
@@ -61,43 +47,34 @@ def osparc_service_labels_jsonschema(tmp_path) -> Dict:
         return json_schema
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope='session')
 def metadata_labels(metadata_file: Path) -> Dict:
     with metadata_file.open() as fp:
         metadata = yaml.safe_load(fp)
         return metadata
 
-
 # TESTS
 
 
-def test_docker_io_simcore_labels_against_files(
-    docker_image: docker.models.images.Image, metadata_labels: Dict
-):
+def test_docker_io_simcore_labels_against_files(docker_image: docker.models.images.Image, metadata_labels: Dict):
     image_labels = docker_image.labels
     io_simcore_labels = _convert_to_simcore_labels(image_labels)
     # check files are identical
     for key, value in io_simcore_labels.items():
         assert key in metadata_labels
-        if key == "description":
-            assert _is_url(metadata_labels[key])
-            assert value == _fetch_url_content(metadata_labels[key])
-        else:
-            assert value == metadata_labels[key]
+        assert value == metadata_labels[key]
 
 
-def test_validate_docker_io_simcore_labels(
-    docker_image: docker.models.images.Image, osparc_service_labels_jsonschema: Dict
-):
+def test_validate_docker_io_simcore_labels(docker_image: docker.models.images.Image, osparc_service_labels_jsonschema: Dict):
     image_labels = docker_image.labels
     # get io labels
     io_simcore_labels = _convert_to_simcore_labels(image_labels)
     # validate schema
     try:
-        jsonschema.validate(io_simcore_labels, osparc_service_labels_jsonschema)
+        jsonschema.validate(io_simcore_labels,
+                            osparc_service_labels_jsonschema)
     except jsonschema.SchemaError:
-        pytest.fail(
-            "Schema {} contains errors".format(osparc_service_labels_jsonschema)
-        )
+        pytest.fail("Schema {} contains errors".format(
+            osparc_service_labels_jsonschema))
     except jsonschema.ValidationError:
         pytest.fail("Failed to validate docker image io labels against schema")