testcloud 0.11.3__tar.gz → 0.11.4__tar.gz

{testcloud-0.11.3/testcloud.egg-info → testcloud-0.11.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: testcloud
-Version: 0.11.3
+Version: 0.11.4
 Summary: A tool to download and boot cloud images locally, with an easy to use API.
 Home-page: https://pagure.io/testcloud
 Author: Mike Ruckman

{testcloud-0.11.3 → testcloud-0.11.4}/docs/source/conf.py

@@ -55,7 +55,7 @@ copyright = "2016-2024, testCloud devs"
 # built documents.
 #
 # The short X.Y version.
-version = "0.11.3"
+version = "0.11.4"
 # The full version, including alpha/beta/rc tags.
 release = version
 

{testcloud-0.11.3 → testcloud-0.11.4}/test/test_config.py

@@ -3,8 +3,14 @@
 # License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+>
 # See the LICENSE file for more details on Licensing
 
+from unittest.mock import patch
+
+import peewee as pw
+
 from testcloud import config
+from testcloud.sql import DBImage, DB
 
+DB = pw.SqliteDatabase(":memory:")
 
 REF_DATA_DIR = "/some/random/dir/for/testing/"
 REF_STORE_DIR = "/some/random/dir/for/testing/backingstore/"
@@ -16,6 +22,15 @@ STORE_DIR = "{}/backingstores"
 class TestConfig(object):
     def setup_method(self, method):
         config._config = None
+        DB.bind([DBImage], bind_refs=False, bind_backrefs=False)
+        DB.connect()
+        DB.create_tables([DBImage])
+        self.patcher = patch('testcloud.sql.data_dir_changed', return_value=None)
+        self.mocked_method = self.patcher.start()
+
+    def teardown_method(self, method):
+        DB.drop_tables([DBImage])
+        DB.close()
 
     def test_get_config_object(self, monkeypatch):
         """Simple test to grab a config object, will return default config

{testcloud-0.11.3 → testcloud-0.11.4}/test/test_image.py

@@ -5,11 +5,16 @@
 
 """ This module is for testing the behaviour of the Image class."""
 
+from unittest.mock import patch
+
 import pytest
+import peewee as pw
 
 from testcloud import image
 from testcloud import exceptions
+from testcloud.sql import DBImage, DB
 
+DB = pw.SqliteDatabase(":memory:")
 
 class TestImage:
 
@@ -40,6 +45,16 @@ class TestImageUriProcess(object):
         self.image_name = "image.img"
         self.len_data = 3
 
+        DB.bind([DBImage], bind_refs=False, bind_backrefs=False)
+        DB.connect()
+        DB.create_tables([DBImage])
+        self.patcher = patch('testcloud.sql.data_dir_changed', return_value=None)
+        self.mocked_method = self.patcher.start()
+
+    def teardown_method(self, method):
+        DB.drop_tables([DBImage])
+        DB.close()
+
     def test_http_ur1(self):
         ref_type = "http"
         ref_path = "localhost/images/{}".format(self.image_name)

{testcloud-0.11.3 → testcloud-0.11.4}/test/test_instance.py

@@ -5,12 +5,17 @@
 
 """ This module is for testing the behaviour of the Image class."""
 
+from unittest import mock
+from unittest.mock import patch
+
 import os
+import peewee as pw
 
-from unittest import mock
 
-from testcloud import instance, image, config, domain_configuration
+from testcloud import instance, image, config
+from testcloud.sql import DBImage, DB
 
+DB = pw.SqliteDatabase(":memory:")
 
 class dotdict(dict):
     # https://stackoverflow.com/a/23689767
@@ -45,6 +50,15 @@ class TestFindInstance(object):
 
     def setup_method(self, method):
         self.conf = config.ConfigData()
+        DB.bind([DBImage], bind_refs=False, bind_backrefs=False)
+        DB.connect()
+        DB.create_tables([DBImage])
+        self.patcher = patch('testcloud.sql.data_dir_changed', return_value=None)
+        self.mocked_method = self.patcher.start()
+
+    def teardown_method(self, method):
+        DB.drop_tables([DBImage])
+        DB.close()
 
     def test_non_existant_instance(self, monkeypatch):
         ref_name = "test-123"

{testcloud-0.11.3 → testcloud-0.11.4}/testcloud/__init__.py

@@ -1,5 +1,5 @@
 # NOTE: if you update version, *make sure* to also update `docs/source/conf.py`
-__version__ = "0.11.3"
+__version__ = "0.11.4"
 
 import signal
 import sys

{testcloud-0.11.3 → testcloud-0.11.4}/testcloud/distro_utils/ubuntu.py

@@ -24,7 +24,7 @@ def get_ubuntu_releases() -> dict:
         raise exceptions.TestcloudImageError
 
     return {
-        "latest": [entry["name"] for entry in releases_resp["entries"] if entry["active"] and "Dev" not in entry["status"]][0],
+        "latest": [entry["name"] for entry in releases_resp["entries"] if entry["active"] and "Current Stable Release" in entry["status"]][0],
         "entries": [entry["name"] for entry in releases_resp["entries"] if entry["active"] and float(entry["version"]) >= 20],
     }
 

{testcloud-0.11.3 → testcloud-0.11.4}/testcloud/instance.py

@@ -339,13 +339,13 @@ class Instance(object):
             self.workarounds.add_condition(
                 '[ ! -f /etc/systemd/system/testcloud.service ]',
                 [
-                    'echo "{0}" >> /opt/testcloud-guest.sh'.format(simple_http_start_guest),
-                    'chmod +x /opt/testcloud-guest.sh',
+                    'echo "{0}" >> /etc/testcloud-guest.sh'.format(simple_http_start_guest),
+                    'chmod +x /etc/testcloud-guest.sh',
                     'echo "[Unit]" >> /etc/systemd/system/testcloud.service',
                     'echo "Description=Testcloud guest integration" >> /etc/systemd/system/testcloud.service',
                     'echo "After=cloud-init.service" >> /etc/systemd/system/testcloud.service',
                     'echo "[Service]" >> /etc/systemd/system/testcloud.service',
-                    'echo "ExecStart=/bin/bash /opt/testcloud-guest.sh" >> /etc/systemd/system/testcloud.service',
+                    'echo "ExecStart=/bin/bash /etc/testcloud-guest.sh" >> /etc/systemd/system/testcloud.service',
                     'echo "[Install]" >> /etc/systemd/system/testcloud.service',
                     'echo "WantedBy=multi-user.target" >> /etc/systemd/system/testcloud.service',
                     'systemctl daemon-reload',

{testcloud-0.11.3 → testcloud-0.11.4}/testcloud/util.py

@@ -138,7 +138,7 @@ def get_image_url(distro_str: str, arch="x86_64", verify=False, additional_handl
         "centos-stream": {"re": r"^c(entos-stream)?(-|:)?(\d+)?$", "fn": get_centos_stream_image_url},
         "coreos": {"re": r"^co(reos)?(-|:)?(%s)?$" % COREOS, "fn": get_coreos_image_url},
         "centos": {"re": r"^c(entos)?(-|:)?(\d+)?$", "fn": get_centos_image_url},
-        "ubuntu": {"re": r"^u(buntu)?(-|:)?(\d+)?$", "fn": get_ubuntu_image_url},
+        "ubuntu": {"re": r"^u(buntu)?([:-]([a-z]+|\d+))?$", "fn": get_ubuntu_image_url},
         "debian": {"re": r"^d(ebian)?(-|:)?(\d+)?$", "fn": get_debian_image_url},
         "alma": {"re": r"^a(lma)?(-|:)?(\d+)?$", "fn": get_alma_image_url},
         "rocky": {"re": r"^r(ocky)?(-|:)?(\d+)?$", "fn": get_rocky_image_url},
@@ -158,7 +158,7 @@ def get_image_url(distro_str: str, arch="x86_64", verify=False, additional_handl
         if match:
             return (verify_url if verify else lambda x: x)(distro["fn"](version=match.group(3) or "latest", arch=arch))
 
-    log.error("Invalid url handle (distro or distro-version) passed, supported handles are: %s" % HELP_LIST)
+    log.error("Invalid url handle (distro or distro{-,:}version) passed, supported handles are: %s" % HELP_LIST)
     raise exceptions.TestcloudImageError
 
 

{testcloud-0.11.3 → testcloud-0.11.4/testcloud.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: testcloud
-Version: 0.11.3
+Version: 0.11.4
 Summary: A tool to download and boot cloud images locally, with an easy to use API.
 Home-page: https://pagure.io/testcloud
 Author: Mike Ruckman