linux: Track power_supply devices by name only instead of full sysfs path

The full native sysfs path of wireless HID battery devices contains a lot of
jitter like USB tree layout or sequence numbers which change after every resume
from auto-suspend. Plus, there are kernel bugs which don't give proper remove
events for those: http://bugzilla.kernel.org/show_bug.cgi?id=62041

As device names within the same subsystem must be unique anyway, and we only
use the device name for constructing the D-BUS object path, only consider the
device name for the device list native → upower object lookup table, i. e. in
up_native_get_native_path().

This fixes the "A handler is already registered for <battery>" assertion crash
if a bluetooth device comes back from auto-suspend. This fixes the
test_bluetooth_mouse_reconnect() test case, drop the expected failure.

https://launchpad.net/bugs/1112907

1 files changed, 2 insertions, 7 deletions

diff --git a/src/linux/integration-test b/src/linux/integration-test
index 82b5ff7..68964ef 100755
--- a/src/linux/integration-test
+++ b/src/linux/integration-test
@@ -211,7 +211,7 @@ class Tests(unittest.TestCase):
         self.assertEqual(self.get_dbus_dev_property(ac_up, 'PowerSupply'), True)
         self.assertEqual(self.get_dbus_dev_property(ac_up, 'Type'), 1)
         self.assertEqual(self.get_dbus_dev_property(ac_up, 'Online'), True)
-        self.assertEqual(self.get_dbus_dev_property(ac_up, 'NativePath'), ac)
+        self.assertEqual(self.get_dbus_dev_property(ac_up, 'NativePath'), 'AC')
         self.stop_daemon()
 
         # offline AC
@@ -252,7 +252,7 @@ class Tests(unittest.TestCase):
         self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFull'), 60.0)
         self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFullDesign'), 80.0)
         self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Voltage'), 12.0)
-        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'NativePath'), bat0)
+        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'NativePath'), 'BAT0')
         self.stop_daemon()
 
         # offline AC + discharging low battery
@@ -380,7 +380,6 @@ class Tests(unittest.TestCase):
         self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFullDesign'), 132.0)
         self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Voltage'), 12.0)
         self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Temperature'), 0.0)
-        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'NativePath'), bat0)
         self.stop_daemon()
 
     def test_battery_energy_charge_mixed(self):
@@ -408,7 +407,6 @@ class Tests(unittest.TestCase):
         self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFull'), 126.0)
         self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFullDesign'), 132.0)
         self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Voltage'), 12.0)
-        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'NativePath'), bat0)
         self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Percentage'), 40.0)
         self.stop_daemon()
 
@@ -436,7 +434,6 @@ class Tests(unittest.TestCase):
         self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFull'), 126.0)
         self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFullDesign'), 132.0)
         self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Voltage'), 12.0)
-        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'NativePath'), bat0)
         self.assertEqual(self.get_dbus_dev_property(bat0_up, 'PowerSupply'), True)
         self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Type'), 2)
 
@@ -623,8 +620,6 @@ class Tests(unittest.TestCase):
         self.assertEqual(self.get_dbus_property('OnLowBattery'), False)
         self.stop_daemon()
 
-    # https://launchpad.net/bugs/1112907
-    @unittest.expectedFailure
     def test_bluetooth_mouse_reconnect(self):
         '''bluetooth mouse powerdown/reconnect'''