Wait for initial ownership and reset signals in login_OwnershipRetaken test
BUG=chromium-os:17660
TEST=login_OwnershipRetaken turns green
R=cmasone@chromium.org
Change-Id: I2d72eb9074790b111c4a0c0b1b1617862fcf5cd9
Reviewed-on: http://gerrit.chromium.org/gerrit/4209
Tested-by: Mattias Nissler <mnissler@chromium.org>
Reviewed-by: Chris Masone <cmasone@chromium.org>
diff --git a/client/site_tests/login_OwnershipRetaken/login_OwnershipRetaken.py b/client/site_tests/login_OwnershipRetaken/login_OwnershipRetaken.py
index 323736c..138c4b7 100644
--- a/client/site_tests/login_OwnershipRetaken/login_OwnershipRetaken.py
+++ b/client/site_tests/login_OwnershipRetaken/login_OwnershipRetaken.py
@@ -80,9 +80,11 @@
policy_string = self.generate_policy(pkey, pubkey, poldata)
self.push_policy(policy_string, sm)
-
# wait for new-owner-key signal, property-changed signal.
- login.wait_for_ownership()
+ utils.poll_for_condition(condition=lambda: self.__received_signals(),
+ desc='Initial policy push complete.',
+ timeout=constants.DEFAULT_OWNERSHIP_TIMEOUT)
+ self.__reset_signal_state()
# grab key, ensure that it's the same as the known key.
if (utils.read_file(constants.OWNER_KEY_FILE) != pubkey):
