pycloudlib 1!7.7.0__tar.gz → 1!7.7.2__tar.gz

{pycloudlib-1!7.7.0/pycloudlib.egg-info → pycloudlib-1!7.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycloudlib
-Version: 1!7.7.0
+Version: 1!7.7.2
 Summary: Python library to launch, interact, and snapshot cloud instances
 Home-page: https://github.com/canonical/pycloudlib
 Author: pycloudlib-devs

pycloudlib-1!7.7.2/VERSION

@@ -0,0 +1 @@
+1!7.7.2

{pycloudlib-1!7.7.0 → pycloudlib-1!7.7.2}/pycloudlib/gce/cloud.py

@@ -409,6 +409,8 @@ class GCE(BaseCloud):
             },
         }
 
+        config.update(kwargs)
+
         if self.service_account_email:
             config["serviceAccounts"] = [{"email": self.service_account_email}]
 

{pycloudlib-1!7.7.0 → pycloudlib-1!7.7.2}/pycloudlib/instance.py

@@ -505,10 +505,12 @@ class BaseInstance(ABC):
         start = time.time()
         end = start + timeout * 60
         while time.time() < end:
-            with suppress(SSHException, OSError):
+            try:
                 boot_id = self.get_boot_id()
                 if not old_boot_id or boot_id != old_boot_id:
                     return
+            except (SSHException, OSError) as e:
+                self._log.debug("Failed to obtain new boot id: %s", e)
             time.sleep(1)
 
         raise PycloudlibTimeoutError(

{pycloudlib-1!7.7.0 → pycloudlib-1!7.7.2/pycloudlib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycloudlib
-Version: 1!7.7.0
+Version: 1!7.7.2
 Summary: Python library to launch, interact, and snapshot cloud instances
 Home-page: https://github.com/canonical/pycloudlib
 Author: pycloudlib-devs

{pycloudlib-1!7.7.0 → pycloudlib-1!7.7.2}/pycloudlib.egg-info/SOURCES.txt

@@ -73,6 +73,8 @@ tests/conftest.py
 tests/integration_tests/__init__.py
 tests/integration_tests/test_public_api.py
 tests/integration_tests/test_qemu.py
+tests/integration_tests/gce/__init__.py
+tests/integration_tests/gce/test_launch.py
 tests/unit_tests/__init__.py
 tests/unit_tests/test_cloud.py
 tests/unit_tests/test_config.py

pycloudlib-1!7.7.2/tests/integration_tests/gce/test_launch.py

@@ -0,0 +1,25 @@
+import pytest
+from pycloudlib.gce.cloud import GCE
+
+
+@pytest.fixture
+def gce_instance():
+    with GCE(tag="test-launch") as gce:
+        yield gce
+
+
+def test_gce_launch_updates_config(gce_instance: GCE):
+    """Test that the launch method updates the config."""
+    daily = gce_instance.daily_image("noble", arch="x86_64")
+    description = "Test description for kwarg verification."
+    with gce_instance.launch(daily, description=description) as inst:
+        result = (
+            gce_instance.compute.instances()
+            .get(
+                project=gce_instance.project,
+                zone=gce_instance.zone,
+                instance=inst.name,
+            )
+            .execute()
+        )
+        assert result["description"] == description

{pycloudlib-1!7.7.0 → pycloudlib-1!7.7.2}/tests/unit_tests/test_instance.py

@@ -47,13 +47,25 @@ class TestWait:
 
     @pytest.mark.parametrize(
         "execute_effect",
-        [lambda *args, **kwargs: Result("", "", 1), SSHException],
+        [
+            pytest.param(
+                lambda *args, **kwargs: Result("", "", 1), id="nonzero"
+            ),
+            pytest.param(SSHException, id="exception"),
+        ],
     )
     @mock.patch.object(BaseInstance, "execute")
     @mock.patch("pycloudlib.instance.time.sleep")
     @mock.patch("pycloudlib.instance.time.time")
+    @mock.patch("logging.Logger.debug")
     def test_wait_execute_failure(
-        self, m_time, m_sleep, m_execute, execute_effect, concrete_instance_cls
+        self,
+        m_debug,
+        m_time,
+        m_sleep,
+        m_execute,
+        execute_effect,
+        concrete_instance_cls,
     ):
         """Test wait calls when execute command fails."""
         instance = concrete_instance_cls(key_pair=None)
@@ -176,8 +188,10 @@ class TestWaitForRestart:
     @mock.patch.object(BaseInstance, "execute")
     @mock.patch("pycloudlib.instance.time.sleep")
     @mock.patch("pycloudlib.instance.time.time")
+    @mock.patch("logging.Logger.debug")
     def test_boot_id_failure(
         self,
+        m_debug,
         m_time,
         m_sleep,
         m_execute,

pycloudlib-1!7.7.0/VERSION

@@ -1 +0,0 @@
-1!7.7.0