commit 60a922ee59d4764a03e83fe3d090016e2d47d019
author Paul Stewart <pstew@chromium.org> Tue Jun 16 11:28:29 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Thu Jun 18 05:08:00 2015 +0000
tree 1d28b9712c81452c4766b7abcfc7a91c7bf56536
parent 16243625eb2954e3336f3843303c8b53be151e52

shill: DeviceTest: Fix DeviceTest.PrependIPv6DNSServers

This test was flaky due to (a) incomplete behavior added to
the mock expectation (b) an uninitialized integer variable
causing the side effect of (a) not to be deterministic.

BUG=chromium:462647
TEST=Unit test

Change-Id: Iec10273a8873897e75726356f0a99fdd7d683e5a
Reviewed-on: https://chromium-review.googlesource.com/278023
Reviewed-by: Garret Kelly <gdk@chromium.org>
Commit-Queue: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>

device.cc

diff --git a/device.cc b/device.cc
index 7de303c..51fb114 100644
--- a/device.cc
+++ b/device.cc
@@ -559,7 +559,7 @@
 
 void Device::OnIPv6DnsServerAddressesChanged() {
   vector<IPAddress> server_addresses;
-  uint32 lifetime;
+  uint32 lifetime = 0;
 
   // Stop any existing timer.
   StopIPv6DNSServerTimer();