From 0189bc0d4e4f88a69d8723956cf623d7da30a63c Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Fri, 26 Aug 2011 13:09:41 -0400 Subject: [PATCH] Revert "testsuite: fix race with SMART data" This reverts commit f1c8f3cadc3441189e00427abed1a2190214d38e. --- tests/run | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/run b/tests/run index 06936b5..57121b0 100755 --- a/tests/run +++ b/tests/run @@ -1088,20 +1088,15 @@ class Smart(UDisksTestCase): self.manager_iface.FindDeviceByDeviceFile(hd)) iface = dbus.Interface(obj, I_D) props = dbus.Interface(obj, dbus.PROPERTIES_IFACE) + info = self.get_info(devname=hd) self.assertEqual(props.Get(I_D, 'DriveAtaSmartIsAvailable'), has_smart) if has_smart: print >> sys.stderr, '[avail] ', - - # wait for SMART data to be read - while props.Get(I_D, 'DriveAtaSmartTimeCollected') == 0: - print >> sys.stderr, '[wait for data] ', - time.sleep(0.5) - - info = self.get_info(devname=hd) self.assert_(info['ATA SMART'].startswith('Updated at ')) + self.assertNotEqual(props.Get(I_D, 'DriveAtaSmartTimeCollected'), 0) global hd_smart_blob hd_smart_blob = ''.join(map(chr, props.Get(I_D, 'DriveAtaSmartBlob'))) # this is of course not truly correct for a test suite, but let's -- 2.7.4