diff options
| author | Alex Vakulenko <avakulenko@google.com> | 2016-01-24 00:57:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-24 00:57:22 +0000 |
| commit | 6ded85c92bab58aa29e62e744ef8c8336b4e5fbc (patch) | |
| tree | decb4622738477d65680fedf417c7a625f257ea5 | |
| parent | a1e54f8c1c2d333d21730936d6d6d95d7354b072 (diff) | |
| parent | 730164cbf080d9c31cd414632f22a52f43d6ef7e (diff) | |
| download | shill-6ded85c92bab58aa29e62e744ef8c8336b4e5fbc.tar.gz | |
shill: Fix build break in unit tests on Chrome OS
am: 730164cbf0
* commit '730164cbf080d9c31cd414632f22a52f43d6ef7e':
shill: Fix build break in unit tests on Chrome OS
| -rw-r--r-- | vpn/openvpn_driver_unittest.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/vpn/openvpn_driver_unittest.cc b/vpn/openvpn_driver_unittest.cc index b433e38b..310f533b 100644 --- a/vpn/openvpn_driver_unittest.cc +++ b/vpn/openvpn_driver_unittest.cc @@ -1295,8 +1295,7 @@ TEST_F(OpenVPNDriverTest, OnConnectTimeoutResolve) { TEST_F(OpenVPNDriverTest, OnReconnectingUnknown) { EXPECT_FALSE(IsConnectTimeoutStarted()); EXPECT_CALL(dispatcher_, - PostDelayedTask(_, GetDefaultConnectTimeoutSeconds() * 1000)) - .WillOnce(Return(true)); + PostDelayedTask(_, GetDefaultConnectTimeoutSeconds() * 1000)); SetDevice(device_); SetService(service_); EXPECT_CALL(*device_, DropConnection()); @@ -1307,11 +1306,9 @@ TEST_F(OpenVPNDriverTest, OnReconnectingUnknown) { TEST_F(OpenVPNDriverTest, OnReconnectingTLSError) { EXPECT_CALL(dispatcher_, - PostDelayedTask(_, GetReconnectOfflineTimeoutSeconds() * 1000)) - .WillOnce(Return(true)); + PostDelayedTask(_, GetReconnectOfflineTimeoutSeconds() * 1000)); EXPECT_CALL(dispatcher_, - PostDelayedTask(_, GetReconnectTLSErrorTimeoutSeconds() * 1000)) - .WillOnce(Return(true)); + PostDelayedTask(_, GetReconnectTLSErrorTimeoutSeconds() * 1000)); driver_->OnReconnecting(OpenVPNDriver::kReconnectReasonOffline); EXPECT_TRUE(IsConnectTimeoutStarted()); |