Skip to content
Snippets Groups Projects
Commit 3bd4895a authored by achill (fossdd)'s avatar achill (fossdd) Committed by Natanael Copa
Browse files

community/upower: upgrade to 1.90.7 

https://gitlab.freedesktop.org/upower/upower/-/releases/v1.90.7
parent 3034fec3
No related branches found
No related tags found
2 merge requests!79570community/firefox-esr: upgrade to 128.7.0,!78318community/upower: upgrade to 1.90.7
Pipeline #289349 skipped
Hide whitespace changes
Inline Side-by-side
Showing
with 41 additions and 225 deletions
community/upower/0001-disable-test-charge-control-polkit.patch deleted 100644 → 0
+ 0
− 157
View file @ 3034fec3
# https://gitlab.freedesktop.org/upower/upower/-/issues/289
diff --git a/src/linux/integration-test.py b/src/linux/integration-test.py
index 6b1514a..885df07 100755
--- a/src/linux/integration-test.py
+++ b/src/linux/integration-test.py
@@ -1072,68 +1072,6 @@ class Tests(dbusmock.DBusTestCase):
with open(f'/sys/class/power_supply/{battery_name}/charge_control_end_threshold') as fp:
self.assertEqual(fp.read(), '80')
- def test_battery_charge_limit_multiple_batteries_polkit_not_allowed(self):
- '''Battery with charge limits with multiple batteries, but polkit isn't allowed'''
-
- if not self.polkit:
- self.start_polkitd({})
-
- self.testbed.add_device('power_supply', 'BAT0', None,
- ['type', 'Battery',
- 'present', '1',
- 'status', 'unknown',
- 'energy_full', '60000000',
- 'energy_full_design', '80000000',
- 'energy_now', '48000000',
- 'voltage_now', '12000000',
- 'charge_control_start_threshold', '0',
- 'charge_control_end_threshold', '100',
- ], [])
- self.testbed.set_property("/sys/class/power_supply/BAT0", 'CHARGE_LIMIT', '70,80')
-
- self.testbed.add_device('power_supply', 'BAT1', None,
- ['type', 'Battery',
- 'present', '1',
- 'status', 'unknown',
- 'energy_full', '60000000',
- 'energy_full_design', '80000000',
- 'energy_now', '48000000',
- 'voltage_now', '12000000',
- 'charge_control_start_threshold', '0',
- 'charge_control_end_threshold', '100',
- ], [])
- self.testbed.set_property("/sys/class/power_supply/BAT1", 'CHARGE_LIMIT', '70,80')
-
- self.start_daemon()
- devs = self.proxy.EnumerateDevices()
- self.assertEqual(len(devs), 2)
- bat0_up = devs[0]
- bat1_up = devs[0]
-
- for bat in [bat0_up, bat1_up]:
- self.assertEqual(self.get_dbus_dev_property(bat, 'ChargeThresholdSupported'), True)
- self.assertEqual(self.get_dbus_dev_property(bat, 'ChargeThresholdEnabled'), False)
- self.assertEqual(self.get_dbus_dev_property(bat, 'ChargeStartThreshold'), 70)
- self.assertEqual(self.get_dbus_dev_property(bat, 'ChargeEndThreshold'), 80)
-
- with self.assertRaises(Exception) as cm:
- self.enable_charge_limits(bat0_up, True)
- ex = cm.exception
- self.assertIn("Operation is not allowed", str(ex))
-
- with self.assertRaises(Exception) as cm:
- self.enable_charge_limits(bat1_up, True)
- ex = cm.exception
- self.assertIn("Operation is not allowed", str(ex))
-
- for bat in [bat0_up, bat1_up]:
- self.assertEqual(self.get_dbus_dev_property(bat, 'ChargeThresholdEnabled'), False)
- battery_name = bat.split('_')[-1]
- with open(f'/sys/class/power_supply/{battery_name}/charge_control_start_threshold') as fp:
- self.assertEqual(fp.read(), '0')
- with open(f'/sys/class/power_supply/{battery_name}/charge_control_end_threshold') as fp:
- self.assertEqual(fp.read(), '100')
-
def test_battery_charge_limit_supported(self):
'''Battery with charge_control_start/end_threshold supported'''
@@ -1211,82 +1149,6 @@ class Tests(dbusmock.DBusTestCase):
with open('/sys/class/power_supply/BAT0/charge_control_end_threshold') as fp:
self.assertEqual(fp.read(), '100')
- def test_battery_charge_limit_supported_polkit_not_allowed(self):
- '''Battery with charge_control_start/end_threshold supported'''
-
- if not self.polkit:
- self.start_polkitd({})
-
- self.testbed.add_device('power_supply', 'BAT0', None,
- ['type', 'Battery',
- 'present', '1',
- 'model_name', 'test',
- 'serial_number', '12',
- 'status', 'unknown',
- 'energy_full', '60000000',
- 'energy_full_design', '80000000',
- 'energy_now', '48000000',
- 'voltage_now', '12000000',
- 'charge_control_start_threshold', '0',
- 'charge_control_end_threshold', '100',
- ], [])
- self.testbed.set_property("/sys/class/power_supply/BAT0", 'CHARGE_LIMIT', '70,80')
-
- def start_daemon(charge_threshold_value=None):
- upower_history_dir_override = tempfile.mkdtemp(prefix='upower-history-')
- if charge_threshold_value is not None:
- with open(os.path.join(upower_history_dir_override, "charging-threshold-status") , 'w') as fp:
- fp.write(charge_threshold_value)
-
- self.start_daemon(history_dir_override=upower_history_dir_override)
- devs = self.proxy.EnumerateDevices()
- self.assertEqual(len(devs), 1)
- return devs[0]
-
- bat0_up = start_daemon()
- self.assertEqual(self.get_dbus_dev_property(bat0_up, 'ChargeThresholdSupported'), True)
- self.assertEqual(self.get_dbus_dev_property(bat0_up, 'ChargeThresholdEnabled'), False)
- self.assertEqual(self.get_dbus_dev_property(bat0_up, 'ChargeStartThreshold'), 70)
- self.assertEqual(self.get_dbus_dev_property(bat0_up, 'ChargeEndThreshold'), 80)
-
- with self.assertRaises(Exception) as cm:
- self.enable_charge_limits(bat0_up, True)
- ex = cm.exception
- self.assertIn("Operation is not allowed", str(ex))
-
- self.assertEqual(self.get_dbus_dev_property(bat0_up, 'ChargeThresholdEnabled'), False)
- # charge limits enabled?
- with open('/sys/class/power_supply/BAT0/charge_control_start_threshold') as fp:
- self.assertEqual(fp.read(), '0')
- with open('/sys/class/power_supply/BAT0/charge_control_end_threshold') as fp:
- self.assertEqual(fp.read(), '100')
-
- with self.assertRaises(Exception) as cm:
- self.enable_charge_limits(bat0_up, False)
- ex = cm.exception
- self.assertIn("Operation is not allowed", str(ex))
-
- self.assertEqual(self.get_dbus_dev_property(bat0_up, 'ChargeThresholdEnabled'), False)
- with open('/sys/class/power_supply/BAT0/charge_control_start_threshold') as fp:
- self.assertEqual(fp.read(), '0')
- with open('/sys/class/power_supply/BAT0/charge_control_end_threshold') as fp:
- self.assertEqual(fp.read(), '100')
-
- self.stop_daemon()
-
- # On startup with threshold set
- self.testbed.set_property("/sys/class/power_supply/BAT0", 'CHARGE_LIMIT', '90,100')
- bat0_up = start_daemon(charge_threshold_value='1')
- self.assertEqual(self.get_dbus_dev_property(bat0_up, 'ChargeThresholdSupported'), True)
- self.assertEqual(self.get_dbus_dev_property(bat0_up, 'ChargeThresholdEnabled'), True)
- self.assertEqual(self.get_dbus_dev_property(bat0_up, 'ChargeStartThreshold'), 90)
- self.assertEqual(self.get_dbus_dev_property(bat0_up, 'ChargeEndThreshold'), 100)
-
- with open('/sys/class/power_supply/BAT0/charge_control_start_threshold') as fp:
- self.assertEqual(fp.read(), '90')
- with open('/sys/class/power_supply/BAT0/charge_control_end_threshold') as fp:
- self.assertEqual(fp.read(), '100')
-
def test_battery_charge_threshold_unsupported(self):
'''Battery with only start_threshold supported'''
community/upower/0001-fix-race-test-bluetooth-mouse.patch 0 → 100644
+ 32
− 0
View file @ 3bd4895a
Patch-Source: https://gitlab.freedesktop.org/upower/upower/-/merge_requests/252
---
From 0074161eb7318ef851f34a3d36e4d53851a2ad5c Mon Sep 17 00:00:00 2001
From: fossdd <fossdd@pwned.life>
Date: Fri, 10 Jan 2025 17:42:14 +0100
Subject: [PATCH] Fix test race in test_bluetooth_hidpp_mouse
We ship the proposed patch already since Oct 2024 in Alpine Linux and is
working for us correctly and fixes the test.
Closes https://gitlab.freedesktop.org/upower/upower/-/issues/228
Co-Authored-By: Bastien Nocera <hadess@hadess.net>
---
src/linux/integration-test.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/linux/integration-test.py b/src/linux/integration-test.py
index 020e6b7d..7ddd975b 100755
--- a/src/linux/integration-test.py
+++ b/src/linux/integration-test.py
@@ -4082,6 +4082,7 @@ class Tests(dbusmock.DBusTestCase):
bat0_up = devs[0]
# Check we have the Bluetooth name
+ self.assertEventually(lambda: self.get_dbus_dev_property(bat0_up, 'Model'), value=alias)
self.assertEqual(self.get_dbus_dev_property(bat0_up, "Model"), alias)
# Check we have the kernel percentage
self.assertEqual(self.get_dbus_dev_property(bat0_up, "Percentage"), 30)
--
GitLab
community/upower/0002-fix-test-sibling-priority-no-overwrite.patch deleted 100644 → 0
+ 0
− 26
View file @ 3034fec3
From 9ee76826bd41a5d3a377dfd6f5835f42ec50be9a Mon Sep 17 00:00:00 2001
From: Stuart Hayhurst <stuart.a.hayhurst@gmail.com>
Date: Wed, 25 Sep 2024 16:56:11 +0100
Subject: [PATCH] Fix race condition in test_sibling_priority_no_overwrite
---
src/linux/integration-test.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/linux/integration-test.py b/src/linux/integration-test.py
index 6b1514a9..f6c804a4 100755
--- a/src/linux/integration-test.py
+++ b/src/linux/integration-test.py
@@ -3148,8 +3148,8 @@ class Tests(dbusmock.DBusTestCase):
def test_sibling_priority_no_overwrite(self):
'Test siblings using the fallback device do not overwrite previous guesses'
- self.start_daemon()
self.testbed.add_from_file(os.path.join(edir, 'tests/wacom-pen-digitiser.device'))
+ self.start_daemon()
self.assertDevs({
'battery_wacom_battery_0': {
--
GitLab
community/upower/0003-fix-race-test-bluetooth-mouse.patch deleted 100644 → 0
+ 0
− 13
View file @ 3034fec3
# https://gitlab.freedesktop.org/upower/upower/-/issues/228
diff --git a/src/linux/integration-test.py b/src/linux/integration-test.py
index e23b87c..4cdefa8 100755
--- a/src/linux/integration-test.py
+++ b/src/linux/integration-test.py
@@ -2715,6 +2715,7 @@ class Tests(dbusmock.DBusTestCase):
bat0_up = devs[0]
# Check we have the Bluetooth name
+ self.assertEventually(lambda: self.get_dbus_dev_property(bat0_up, 'Model'), value=alias)
self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Model'), alias)
# Check we have the kernel percentage
self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Percentage'), 30)
community/upower/0005-fix-test-charge-cycles.patch deleted 100644 → 0
+ 0
− 14
View file @ 3034fec3
# longaarch64 only - https://gitlab.freedesktop.org/upower/upower/-/issues/290
diff --git a/src/linux/integration-test.py b/src/linux/integration-test.py
index 4cdefa8..70fbad6 100755
--- a/src/linux/integration-test.py
+++ b/src/linux/integration-test.py
@@ -243,7 +243,7 @@ class Tests(dbusmock.DBusTestCase):
except OSError:
pass
try:
- self.assertEqual(self.daemon.wait(timeout=5.0), 0)
+ self.assertEqual(self.daemon.wait(timeout=10.0), 0)
except subprocess.TimeoutExpired:
try:
self.daemon.kill()
community/upower/APKBUILD
+ 9
− 15
View file @ 3bd4895a
# Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=upower pkgname=upower
pkgver=1.90.6 pkgver=1.90.7
pkgrel=1 pkgrel=0
pkgdesc="Power Management Services" pkgdesc="Power Management Services"
url="https://upower.freedesktop.org" url="https://upower.freedesktop.org"
arch="all" arch="all"
...@@ -15,6 +15,7 @@ makedepends=" ...@@ -15,6 +15,7 @@ makedepends="
libgudev-dev libgudev-dev
libxslt libxslt
meson meson
polkit-dev
" "
checkdepends=" checkdepends="
dbus dbus
...@@ -24,19 +25,15 @@ checkdepends=" ...@@ -24,19 +25,15 @@ checkdepends="
py3-packaging py3-packaging
umockdev-dev umockdev-dev
" "
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-zsh-completion"
source="https://gitlab.freedesktop.org/upower/upower/-/archive/v$pkgver/upower-v$pkgver.tar.bz2 source="https://gitlab.freedesktop.org/upower/upower/-/archive/v$pkgver/upower-v$pkgver.tar.bz2
0001-disable-test-charge-control-polkit.patch 0001-fix-race-test-bluetooth-mouse.patch
0002-fix-test-sibling-priority-no-overwrite.patch 0002-fix-self-test-sleep-duration.patch
0003-fix-race-test-bluetooth-mouse.patch
0004-fix-self-test-sleep-duration.patch
0005-fix-test-charge-cycles.patch
" "
builddir="$srcdir/$pkgname-v$pkgver" builddir="$srcdir/$pkgname-v$pkgver"
build() { build() {
abuild-meson \ abuild-meson \
-Db_lto=true \
-Dsystemdsystemunitdir=no \ -Dsystemdsystemunitdir=no \
-Dman=true \ -Dman=true \
. output . output
...@@ -55,10 +52,7 @@ package() { ...@@ -55,10 +52,7 @@ package() {
} }
sha512sums=" sha512sums="
8ac1c0685b73efece0ecfbee7a37cb7c47601d252210cf3ecc32d1e44cabdde4c8b59b9a93d8bf21e25b3ecbbb95fb952958b37a53f878128747231d4334e5a6 upower-v1.90.6.tar.bz2 2ef7412c26b2c3a9be533a53f579669b532e321196886725bd4333b54c0c7fbe307ce84776ed5cbfdf82a9822979fc0906f62ea7c5d42171ac6819b3e4c77b97 upower-v1.90.7.tar.bz2
01afab0fefc2fbcf6b49cec2ab07ce1b37fe7c35c3fc23e983b7206d2b37e4f9d564f4dd46dce8cb32ddd1f36d534adea8703fb8bbe8c80c7c8fd0fcd716ca7a 0001-disable-test-charge-control-polkit.patch 11eb9ad65ed7055b4a9ce6ba97c849d7cd08510ec56d9f7826f43a666aa3c6c980a1a6c92df6c479947d1f439c64afa77eb650351f4d2e59b724ed9c9665c07e 0001-fix-race-test-bluetooth-mouse.patch
6c7df958e6841a0799f31c8bb8d6dffa431c336ac13dab3141e3a90d4f11a6d5c6e10ab653f039aae0029552ba05417b6d2d4b4829b1444880f58e1b74446fa1 0002-fix-test-sibling-priority-no-overwrite.patch 1b582f31660b82444682b6786913a6eb4e8e13c8370205b31da1bf9328e0d2e62c2596bfb4e82faf25e658f379ddb92d7f3f97ec8ddfdb512339d4d3d663f708 0002-fix-self-test-sleep-duration.patch
d8403210f1f5bb87d3a77498fd1d6684327aed8a624d4c2606dc07882450552ab14fbd5fec3f0b7c409bb09a248d563a140a18cb1c8f91b8a55c2f6d72d01adb 0003-fix-race-test-bluetooth-mouse.patch
1b582f31660b82444682b6786913a6eb4e8e13c8370205b31da1bf9328e0d2e62c2596bfb4e82faf25e658f379ddb92d7f3f97ec8ddfdb512339d4d3d663f708 0004-fix-self-test-sleep-duration.patch
860c8592a11ea760e01842986e3d83dfd547ec09411c61201500e773af1abba28e9e8ac04be2c9d0940097da4cbdfda7e3b6dce8df19ee88ade67ad6a9a8aa72 0005-fix-test-charge-cycles.patch
" "
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment