Skip to content

Commit

Permalink
Update test-cases to work with multiprocess checkAPT.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mtwebster
mtwebster committed Dec 4, 2024
1 parent da504a6 commit 99ed62e
Show file tree
Hide file tree
Showing 3 changed files with 105 additions and 53 deletions.
62 changes: 28 additions & 34 deletions usr/lib/linuxmint/mintUpdate/Classes.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,34 +120,34 @@ def __init__(self, package=None, source_name=None):
self.short_description = package.candidate.raw_description
self.description = package.candidate.description
self.archive = ""
if (self.new_version != self.old_version):
self.type = "package"
self.origin = ""
for origin in package.candidate.origins:

self.type = "package"
self.origin = ""
for origin in package.candidate.origins:
self.origin = origin.origin
self.site = origin.site
self.archive = origin.archive
if origin.origin == "Ubuntu":
self.origin = "ubuntu"
elif origin.origin == "Debian":
self.origin = "debian"
elif origin.origin.startswith("LP-PPA"):
self.origin = origin.origin
self.site = origin.site
self.archive = origin.archive
if origin.origin == "Ubuntu":
self.origin = "ubuntu"
elif origin.origin == "Debian":
self.origin = "debian"
elif origin.origin.startswith("LP-PPA"):
self.origin = origin.origin
if origin.origin == "Ubuntu" and '-security' in origin.archive:
self.type = "security"
break
if origin.origin == "Debian" and '-Security' in origin.label:
self.type = "security"
break
if source_name in ["firefox", "thunderbird", "chromium"]:
self.type = "security"
break
if origin.origin == "linuxmint":
if origin.component == "romeo":
self.type = "unstable"
break
if package.candidate.section == "kernel" or self.package_name.startswith("linux-headers") or self.real_source_name in ["linux", "linux-kernel", "linux-signed", "linux-meta"]:
self.type = "kernel"
if origin.origin == "Ubuntu" and '-security' in origin.archive:
self.type = "security"
break
if origin.origin == "Debian" and '-Security' in origin.label:
self.type = "security"
break
if source_name in ["firefox", "thunderbird", "chromium"]:
self.type = "security"
break
if origin.origin == "linuxmint":
if origin.component == "romeo":
self.type = "unstable"
break
if package.candidate.section == "kernel" or self.package_name.startswith("linux-headers") or self.real_source_name in ["linux", "linux-kernel", "linux-signed", "linux-meta"]:
self.type = "kernel"

def add_package(self, pkg):
self.package_names.append(pkg.name)
Expand Down Expand Up @@ -203,13 +203,7 @@ def __init__(self, settings, logger):
os.system("mkdir -p %s" % CONFIG_PATH)
self.path = os.path.join(CONFIG_PATH, "updates.json")

# Test case
self.test_mode = False
test_path = "/usr/share/linuxmint/mintupdate/tests/%s.json" % os.getenv("MINTUPDATE_TEST")
if os.path.exists(test_path):
os.system("mkdir -p %s" % CONFIG_PATH)
os.system("cp %s %s" % (test_path, self.path))
self.test_mode = True
self.test_mode = os.getenv("MINTUPDATE_TEST") == "tracker-max-age"

self.tracker_version = 1 # version of the data structure
self.settings = settings
Expand Down
8 changes: 6 additions & 2 deletions usr/lib/linuxmint/mintUpdate/checkAPT.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def __init__(self):
self.settings = Gio.Settings(schema_id="com.linuxmint.updates")
self.cache = apt.Cache()
self.priority_updates_available = False
self.updates = {}

def load_aliases(self):
self.aliases = {}
Expand Down Expand Up @@ -176,8 +177,11 @@ def get_kernel_version_from_meta_package(self, pkg):
return self.get_kernel_version_from_meta_package(deppkg)
return None

def add_update(self, package, kernel_update=False):
source_version = package.candidate.version
def add_update(self, package, kernel_update=False, test_version=None):
if test_version is not None:
source_version = test_version
else:
source_version = package.candidate.version
# Change version of kernel meta packages to that of the actual kernel
# for grouping with related updates
if package.candidate.source_name.startswith("linux-meta"):
Expand Down
88 changes: 71 additions & 17 deletions usr/lib/linuxmint/mintUpdate/mintUpdate.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
# local imports
import logger
from kernelwindow import KernelWindow
from Classes import Update, PRIORITY_UPDATES, UpdateTracker, _idle, _async
from Classes import Update, PRIORITY_UPDATES, CONFIG_PATH, UpdateTracker, _idle, _async


settings = Gio.Settings(schema_id="com.linuxmint.updates")
Expand Down Expand Up @@ -642,8 +642,9 @@ def show_updates_in_UI(self, num_visible, num_software, num_security, download_s
self.ui_statusbar.set_visible(False)
status_string = ""
details = []
for update in updates:
details.append(f"{update.source_name} {update.new_version}")

for item in model_items:
details.append(f"{item[0].source_name} {item[0].new_version}")
details = ", ".join(details)
self.ui_label_self_update_details.set_text(details)
else:
Expand Down Expand Up @@ -2141,10 +2142,70 @@ def refresh_flatpak_cache(self):
def on_cache_updated(self, transaction=None, exit_state=None):
self.refreshing_apt = False


# ---------------- Test Mode ------------------------------------------#
def dummy_update(self, check, package_name, kernel=False):
pkg = check.cache[package_name]
check.add_update(pkg, kernel, "99.0.0")

# Part of check_apt_in_external_process fork
def handle_apt_check_test(self, queue):
test_mode = os.getenv("MINTUPDATE_TEST")
if test_mode is None:
return False

if test_mode == "error":
# See how an error from checkAPT subprocess is handled
raise Exception("Testing - this is a simulated error.")
elif test_mode == "up-to-date":
# Simulate checkAPT finding no updates
queue.put([None, []])
elif test_mode == "self-update":
# Simulate an update of mintupdate itself.
check = checkAPT.APTCheck()
self.dummy_update(check, "mintupdate", False)
queue.put([None, check.updates.values()])
elif test_mode == "updates":
# Simulate some normal updates
check = checkAPT.APTCheck()
self.dummy_update(check, "python3", False)
self.dummy_update(check, "mint-meta-core", False)
self.dummy_update(check, "linux-generic", True)
self.dummy_update(check, "xreader", False)
queue.put([None, check.updates.values()])
elif test_mode == "tracker-max-age":
# Simulate the UpdateTracker notifying about updates.
check = checkAPT.APTCheck()
self.dummy_update(check, "dnsmasq", False)
self.dummy_update(check, "linux-generic", True)

updates_json = {
"mint-meta-common": { "type": "package", "since": "2020.12.03", "days": 99 },
"linux-meta": { "type": "security", "since": "2020.12.03", "days": 99 }
}
root_json = {
"updates": updates_json,
"version": 1,
"checked": "2020.12.04",
"notified": "2020.12.03"
}

os.makedirs(CONFIG_PATH, exist_ok=True)
with open(os.path.join(CONFIG_PATH, "updates.json"), "w") as f:
json.dump(root_json, f)

queue.put([None, check.updates.values()])

return True
# ---------------- Testing ------------------------------------------#

# called in a different process
def check_apt_in_external_process(self, queue):
# in the queue we put: error_message (None if successful), list_of_updates (None if error)
try:
if self.handle_apt_check_test(queue):
return

check = checkAPT.APTCheck()
check.find_changes()
check.apply_l10n_descriptions()
Expand Down Expand Up @@ -2186,20 +2247,13 @@ def refresh_updates(self):
try:
error = None
updates = None
if os.getenv("MINTUPDATE_TEST") is None:
output = subprocess.run("/usr/lib/linuxmint/mintUpdate/checkAPT.py", stdout=subprocess.PIPE).stdout.decode("utf-8")
# call checkAPT in a different process
queue = Queue()
process = Process(target=self.check_apt_in_external_process, args=(queue,))
process.start()
error, updates = queue.get()
process.join()
# TODO rewrite tests to deal with classes vs text lines
# else:
# if os.path.exists("/usr/share/linuxmint/mintupdate/tests/%s.test" % os.getenv("MINTUPDATE_TEST")):
# output = subprocess.run("sleep 1; cat /usr/share/linuxmint/mintupdate/tests/%s.test" % os.getenv("MINTUPDATE_TEST"), shell=True, stdout=subprocess.PIPE).stdout.decode("utf-8")
# else:
# output = subprocess.run("/usr/lib/linuxmint/mintUpdate/checkAPT.py", stdout=subprocess.PIPE).stdout.decode("utf-8")

# call checkAPT in a different process
queue = Queue()
process = Process(target=self.check_apt_in_external_process, args=[queue])
process.start()
error, updates = queue.get()
process.join()

if error is not None:
self.logger.write_error("Error in checkAPT.py, could not refresh the list of updates")
Expand Down

0 comments on commit 99ed62e

Please sign in to comment.