added new command line in pytest to make development faster

Author: sanderegg

packages/pytest-fixtures/docker_registry.py

@@ -14,24 +14,31 @@
 
 
 @pytest.fixture(scope="session")
-def docker_registry() -> str:
+def docker_registry(keepdockerup: bool) -> str:
     # run the registry outside of the stack
     docker_client = docker.from_env()
-    container = docker_client.containers.run(
-        "registry:2",
-        ports={"5000": "5000"},
-        environment=["REGISTRY_STORAGE_DELETE_ENABLED=true"],
-        restart_policy={"Name": "always"},
-        detach=True,
-    )
+    # try to login to private registry
     host = "127.0.0.1"
     port = 5000
     url = "{host}:{port}".format(host=host, port=port)
-    # Wait until we can connect
-    assert _wait_till_registry_is_responsive(url)
+    container = None
+    try:
+        docker_client.login(registry=url, username="simcore")
+        container = docker_client.containers.list({"name":"pytest_registry"})[0]
+    except Exception:
+        print("Warning: docker registry is already up!")
+        container = docker_client.containers.run(
+            "registry:2",
+            ports={"5000": "5000"},
+            name="pytest_registry",
+            environment=["REGISTRY_STORAGE_DELETE_ENABLED=true"],
+            restart_policy={"Name": "always"},
+            detach=True,
+        )
+    
+        # Wait until we can connect
+        assert _wait_till_registry_is_responsive(url)
 
-    # test the registry
-    docker_client = docker.from_env()
     # get the hello world example from docker hub
     hello_world_image = docker_client.images.pull("hello-world", "latest")
     # login to private registry
@@ -49,11 +56,11 @@ def docker_registry() -> str:
     docker_client.images.remove(image=private_image.id)
 
     yield url
+    if not keepdockerup:
+        container.stop()
 
-    container.stop()
-
-    while docker_client.containers.list(filters={"name": container.name}):
-        time.sleep(1)
+        while docker_client.containers.list(filters={"name": container.name}):
+            time.sleep(1)
 
 
 @tenacity.retry(wait=tenacity.wait_fixed(1), stop=tenacity.stop_after_delay(60))
@@ -81,9 +88,9 @@ def sleeper_service(docker_registry: str) -> Dict[str, str]:
     image_labels = image.labels
 
     yield {
-        json.loads(key): json.loads(value)
+        key[len("io.simcore."):]: json.loads(value)[key[len("io.simcore."):]]
         for key, value in image_labels.items()
-        if key.starts_with("io.simcore.")
+        if key.startswith("io.simcore.")
     }
 
 
@@ -113,7 +120,7 @@ def jupyter_service(docker_registry: str) -> Dict[str, str]:
     image_labels = image.labels
 
     yield {
-        json.loads(key): json.loads(value)
+        key[len("io.simcore."):]: json.loads(value)[key[len("io.simcore."):]]
         for key, value in image_labels.items()
-        if key.starts_with("io.simcore.")
+        if key.startswith("io.simcore.")
     }

packages/pytest-fixtures/docker_swarm.py

@@ -34,12 +34,23 @@ def docker_swarm(docker_client: docker.client.DockerClient) -> None:
         assert docker_client.swarm.leave(force=True)
 
 
+def pytest_addoption(parser):
+    parser.addoption("--keepdockerup", action="store_true", default=False, help="do not bring stack/registry down")
+
+
+@pytest.fixture(scope="session")
+def keepdockerup(request) -> bool:
+    return request.config.getoption("--keepdockerup") == True
+
+
+
 @pytest.fixture(scope="module")
 def docker_stack(
     docker_swarm,
     docker_client: docker.client.DockerClient,
     core_services_config_file: Path,
     ops_services_config_file: Path,
+    keepdockerup: bool
 ) -> Dict:
     stacks = {"simcore": core_services_config_file, "ops": ops_services_config_file}
 
@@ -91,6 +102,10 @@ def _print_services(msg: str) -> None:
 
     _print_services("[AFTER TEST]")
 
+    if keepdockerup:
+        # skip bringing the stack down
+        return
+
     # clean up. Guarantees that all services are down before creating a new stack!
     #
     # WORKAROUND https://github.com/moby/moby/issues/30942#issue-207070098