[gnome-battery-bench] integration-test: test syfs attr with newline only
- From: Christian Kellner <gicmo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-battery-bench] integration-test: test syfs attr with newline only
- Date: Tue, 23 May 2017 16:22:31 +0000 (UTC)
commit 62f90d70498f1d657a916b4b6a90d3c072e3effc
Author: Christian Kellner <gicmo gnome org>
Date: Thu May 11 14:47:07 2017 +0200
integration-test: test syfs attr with newline only
src/integration-test | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/src/integration-test b/src/integration-test
index 715007c..b50b4b8 100755
--- a/src/integration-test
+++ b/src/integration-test
@@ -165,13 +165,14 @@ class Tests(unittest.TestCase):
return LogReader(self.logfile.name)
def add_std_platform(self):
- self.testbed.add_device('dmi', 'virtual/dmi/id', None,
- ['sys_vendor', 'GNOME.org',
- 'product_name', 'hal',
- 'product_version', '9000',
- 'bios_vendor', 'bios.GNOME.org',
- 'bios_version', '9k',
- 'bios_date', '01/23/1997'], [])
+ dev = self.testbed.add_device('dmi', 'virtual/dmi/id', None,
+ ['sys_vendor', 'GNOME.org',
+ 'product_name', 'hal',
+ 'product_version', '9000',
+ 'bios_vendor', 'bios.GNOME.org',
+ 'bios_version', '9k',
+ 'bios_date', '01/23/1997'], [])
+ return dev
def add_std_power_supply(self, vendor='GNOME.org', model='B1'):
ac = self.testbed.add_device('power_supply', 'AC', None,
@@ -211,7 +212,7 @@ class Tests(unittest.TestCase):
vendor = 'GNOME.org'
model = 'B1'
- self.add_std_platform()
+ plt = self.add_std_platform()
self.add_std_power_supply(vendor=vendor, model=model)
log = self.gbb("info", ["--json"])
@@ -233,6 +234,13 @@ class Tests(unittest.TestCase):
self.assertEqual(bats[0]['vendor'], vendor)
self.assertEqual(bats[0]['model'], model)
+ self.testbed.set_attribute(plt, 'product_version', '\n')
+ log = self.gbb("info", ["--json"])
+ out = json.loads(log)
+ self.assertTrue('hardware' in out)
+ hw = out['hardware']
+ self.assertNotIn('version', hw)
+
def test_basic_monitor(self):
ac, b0 = self.add_std_power_supply()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]