clonebox 1.1.12__tar.gz → 1.1.13__tar.gz

{clonebox-1.1.12/src/clonebox.egg-info → clonebox-1.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clonebox
-Version: 1.1.12
+Version: 1.1.13
 Summary: Clone your workstation environment to an isolated VM with selective apps, paths and services
 Author: CloneBox Team
 License: Apache-2.0

{clonebox-1.1.12 → clonebox-1.1.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "clonebox"
-version = "1.1.12"
+version = "1.1.13"
 description = "Clone your workstation environment to an isolated VM with selective apps, paths and services"
 readme = "README.md"
 license = {text = "Apache-2.0"}

{clonebox-1.1.12 → clonebox-1.1.13}/src/clonebox/cloner.py

@@ -263,13 +263,21 @@ class SelectiveVMCloner:
 
             return cached_path
 
-    def _default_network_active(self) -> bool:
-        """Check if libvirt default network is active."""
+    def _default_network_state(self) -> str:
         try:
-            net = self.conn.networkLookupByName("default")
-            return net.isActive() == 1
+            active = self.conn.listNetworks() or []
+            if "default" in active:
+                return "active"
+            defined = self.conn.listDefinedNetworks() or []
+            if "default" in defined:
+                return "inactive"
+            return "missing"
         except Exception:
-            return False
+            return "unknown"
+
+    def _default_network_active(self) -> bool:
+        """Check if libvirt default network is active."""
+        return self._default_network_state() == "active"
 
     def resolve_network_mode(self, config: VMConfig) -> str:
         """Resolve network mode based on config and session type."""
@@ -310,10 +318,9 @@ class SelectiveVMCloner:
             )
 
         # Check default network
-        try:
-            net = self.conn.networkLookupByName("default")
-            checks["default_network"] = net.isActive() == 1
-        except libvirt.libvirtError:
+        default_net_state = self._default_network_state()
+        checks["default_network"] = default_net_state == "active"
+        if default_net_state in {"inactive", "missing", "unknown"}:
             checks["network_error"] = (
                 "Default network not found or inactive.\n"
                 "  For user session, CloneBox can use user-mode networking (slirp) automatically.\n"
@@ -1404,7 +1411,8 @@ fi
                     "  - chown -R 1000:1000 /home/ubuntu/.config /home/ubuntu/.cache /home/ubuntu/.local",
                     "  - chmod 700 /home/ubuntu/.config /home/ubuntu/.cache",
                     "  - systemctl set-default graphical.target",
-                    "  - systemctl enable gdm3 || systemctl enable gdm || true",
+                    "  - systemctl enable --now gdm3 || systemctl enable --now gdm || true",
+                    "  - systemctl start display-manager || true",
                 ]
             )
 

{clonebox-1.1.12 → clonebox-1.1.13/src/clonebox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clonebox
-Version: 1.1.12
+Version: 1.1.13
 Summary: Clone your workstation environment to an isolated VM with selective apps, paths and services
 Author: CloneBox Team
 License: Apache-2.0

{clonebox-1.1.12 → clonebox-1.1.13}/tests/test_cloner.py

@@ -167,7 +167,8 @@ class TestSelectiveVMClonerMethods:
     def test_check_prerequisites_returns_dict(self, mock_libvirt):
         mock_conn = MagicMock()
         mock_conn.isAlive.return_value = True
-        mock_conn.networkLookupByName.return_value.isActive.return_value = 1
+        mock_conn.listNetworks.return_value = ["default"]
+        mock_conn.listDefinedNetworks.return_value = []
         mock_libvirt.open.return_value = mock_conn
         mock_libvirt.openAuth.return_value = mock_conn
 

{clonebox-1.1.12 → clonebox-1.1.13}/tests/test_network.py

@@ -54,10 +54,8 @@ class TestNetworkMode:
         mock_conn = MagicMock()
         mock_libvirt.open.return_value = mock_conn
         mock_libvirt.openAuth.return_value = mock_conn
-        mock_net = MagicMock()
-        mock_net.isActive.return_value = 1
-        mock_conn.networkLookupByName.return_value = mock_net
-        mock_libvirt.open.return_value = mock_conn
+        mock_conn.listNetworks.return_value = ["default"]
+        mock_conn.listDefinedNetworks.return_value = []
 
         cloner = SelectiveVMCloner(user_session=True)
         config = VMConfig(network_mode="auto")
@@ -68,18 +66,9 @@ class TestNetworkMode:
     @patch("clonebox.cloner.libvirt")
     def test_resolve_network_mode_auto_user_no_default(self, mock_libvirt):
         """Test auto mode with user session and no default network falls back to user."""
-        # Handle missing libvirt module in test environment
-        try:
-            import libvirt as real_libvirt
-
-            libvirt_error = real_libvirt.libvirtError
-        except ImportError:
-
-            class libvirt_error(Exception):
-                pass
-
         mock_conn = MagicMock()
-        mock_conn.networkLookupByName.side_effect = libvirt_error("No network")
+        mock_conn.listNetworks.return_value = []
+        mock_conn.listDefinedNetworks.return_value = []
         mock_libvirt.open.return_value = mock_conn
         mock_libvirt.openAuth.return_value = mock_conn
 
@@ -134,10 +123,8 @@ class TestNetworkMode:
         mock_conn = MagicMock()
         mock_libvirt.open.return_value = mock_conn
         mock_libvirt.openAuth.return_value = mock_conn
-        mock_net = MagicMock()
-        mock_net.isActive.return_value = 1
-        mock_conn.networkLookupByName.return_value = mock_net
-        mock_libvirt.open.return_value = mock_conn
+        mock_conn.listNetworks.return_value = ["default"]
+        mock_conn.listDefinedNetworks.return_value = []
 
         cloner = SelectiveVMCloner()
         assert cloner._default_network_active() is True
@@ -149,10 +136,8 @@ class TestNetworkMode:
         mock_conn = MagicMock()
         mock_libvirt.open.return_value = mock_conn
         mock_libvirt.openAuth.return_value = mock_conn
-        mock_net = MagicMock()
-        mock_net.isActive.return_value = 0
-        mock_conn.networkLookupByName.return_value = mock_net
-        mock_libvirt.open.return_value = mock_conn
+        mock_conn.listNetworks.return_value = []
+        mock_conn.listDefinedNetworks.return_value = ["default"]
 
         cloner = SelectiveVMCloner()
         assert cloner._default_network_active() is False
@@ -160,18 +145,9 @@ class TestNetworkMode:
     @patch("clonebox.cloner.libvirt")
     def test_default_network_active_not_found(self, mock_libvirt):
         """Test _default_network_active returns False when network not found."""
-        # Handle missing libvirt module in test environment
-        try:
-            import libvirt as real_libvirt
-
-            libvirt_error = real_libvirt.libvirtError
-        except ImportError:
-
-            class libvirt_error(Exception):
-                pass
-
         mock_conn = MagicMock()
-        mock_conn.networkLookupByName.side_effect = libvirt_error("Not found")
+        mock_conn.listNetworks.return_value = []
+        mock_conn.listDefinedNetworks.return_value = []
         mock_libvirt.open.return_value = mock_conn
         mock_libvirt.openAuth.return_value = mock_conn