shill: cellular: Change cellular disconnect timeout to 45s.
BUG=chromium-os:36292
TEST=Unit tests
Change-Id: I5dfa829d94cda7f9fee3a074bfcfd62ffdfe5864
Reviewed-on: https://gerrit.chromium.org/gerrit/37867
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Ready: Thieu Le <thieule@chromium.org>
Tested-by: Thieu Le <thieule@chromium.org>
diff --git a/cellular_capability.cc b/cellular_capability.cc
index 81382ab..13e076d 100644
--- a/cellular_capability.cc
+++ b/cellular_capability.cc
@@ -23,6 +23,7 @@
const int CellularCapability::kTimeoutActivate = 120000;
const int CellularCapability::kTimeoutConnect = 45000;
const int CellularCapability::kTimeoutDefault = 5000;
+const int CellularCapability::kTimeoutDisconnect = 45000;
const int CellularCapability::kTimeoutEnable = 15000;
const int CellularCapability::kTimeoutRegister = 90000;
const int CellularCapability::kTimeoutScan = 120000;
diff --git a/cellular_capability.h b/cellular_capability.h
index 647a9b3..6772608 100644
--- a/cellular_capability.h
+++ b/cellular_capability.h
@@ -62,6 +62,7 @@
static const int kTimeoutActivate;
static const int kTimeoutConnect;
static const int kTimeoutDefault;
+ static const int kTimeoutDisconnect;
static const int kTimeoutEnable;
static const int kTimeoutRegister;
static const int kTimeoutScan;
diff --git a/cellular_capability_classic.cc b/cellular_capability_classic.cc
index 5503d7b..05249c8 100644
--- a/cellular_capability_classic.cc
+++ b/cellular_capability_classic.cc
@@ -239,7 +239,7 @@
const ResultCallback &callback) {
SLOG(Cellular, 2) << __func__;
if (proxy_.get())
- proxy_->Disconnect(error, callback, kTimeoutDefault);
+ proxy_->Disconnect(error, callback, kTimeoutDisconnect);
}
void CellularCapabilityClassic::Activate(const string &/*carrier*/,
diff --git a/cellular_capability_classic_unittest.cc b/cellular_capability_classic_unittest.cc
index 03e81c6..f444dcb 100644
--- a/cellular_capability_classic_unittest.cc
+++ b/cellular_capability_classic_unittest.cc
@@ -349,7 +349,7 @@
EXPECT_TRUE(cellular_->GetAllowRoaming(NULL));
EXPECT_EQ(Cellular::kStateConnected, cellular_->state_);
- EXPECT_CALL(*proxy_, Disconnect(_, _, CellularCapability::kTimeoutDefault))
+ EXPECT_CALL(*proxy_, Disconnect(_, _, CellularCapability::kTimeoutDisconnect))
.WillOnce(Invoke(this, &CellularCapabilityTest::InvokeDisconnect));
SetProxy();
cellular_->state_ = Cellular::kStateConnected;
@@ -446,7 +446,7 @@
}
TEST_F(CellularCapabilityTest, StopModemDisconnectSuccess) {
- EXPECT_CALL(*proxy_, Disconnect(_, _, CellularCapability::kTimeoutDefault))
+ EXPECT_CALL(*proxy_, Disconnect(_, _, CellularCapability::kTimeoutDisconnect))
.WillOnce(Invoke(this,
&CellularCapabilityTest::InvokeDisconnect));
EXPECT_CALL(*proxy_, Enable(_, _, _, CellularCapability::kTimeoutEnable))
@@ -462,7 +462,7 @@
}
TEST_F(CellularCapabilityTest, StopModemDisconnectFail) {
- EXPECT_CALL(*proxy_, Disconnect(_, _, CellularCapability::kTimeoutDefault))
+ EXPECT_CALL(*proxy_, Disconnect(_, _, CellularCapability::kTimeoutDisconnect))
.WillOnce(Invoke(this,
&CellularCapabilityTest::InvokeDisconnectFail));
EXPECT_CALL(*proxy_, Enable(_, _, _, CellularCapability::kTimeoutEnable))
@@ -480,7 +480,7 @@
TEST_F(CellularCapabilityTest, DisconnectNoProxy) {
Error error;
ResultCallback disconnect_callback;
- EXPECT_CALL(*proxy_, Disconnect(_, _, CellularCapability::kTimeoutDefault))
+ EXPECT_CALL(*proxy_, Disconnect(_, _, CellularCapability::kTimeoutDisconnect))
.Times(0);
ReleaseCapabilityProxies();
capability_->Disconnect(&error, disconnect_callback);
diff --git a/cellular_capability_universal.cc b/cellular_capability_universal.cc
index 5a56982..135d7a0 100644
--- a/cellular_capability_universal.cc
+++ b/cellular_capability_universal.cc
@@ -283,7 +283,7 @@
error,
Bind(&CellularCapabilityUniversal::Stop_DisconnectCompleted,
weak_ptr_factory_.GetWeakPtr(), callback),
- kTimeoutDefault);
+ kTimeoutDisconnect);
if (error->IsFailure())
callback.Run(*error);
} else {
@@ -343,7 +343,7 @@
modem_simple_proxy_->Disconnect(bearer_path_,
error,
callback,
- kTimeoutDefault);
+ kTimeoutDisconnect);
}
}
diff --git a/cellular_capability_universal_unittest.cc b/cellular_capability_universal_unittest.cc
index d1a7425..69be576 100644
--- a/cellular_capability_universal_unittest.cc
+++ b/cellular_capability_universal_unittest.cc
@@ -390,7 +390,7 @@
Bind(&CellularCapabilityUniversalTest::TestCallback, Unretained(this));
EXPECT_CALL(*modem_simple_proxy,
Disconnect(::DBus::Path("/"), _, _,
- CellularCapability::kTimeoutDefault))
+ CellularCapability::kTimeoutDisconnect))
.WillOnce(SaveArg<2>(&disconnect_callback));
capability_->cellular()->modem_state_ = Cellular::kModemStateConnected;
capability_->StopModem(&error, callback);
@@ -410,7 +410,7 @@
Error error;
ResultCallback disconnect_callback;
EXPECT_CALL(*modem_simple_proxy_,
- Disconnect(_, _, _, CellularCapability::kTimeoutDefault))
+ Disconnect(_, _, _, CellularCapability::kTimeoutDisconnect))
.Times(0);
capability_->Disconnect(&error, disconnect_callback);
}
@@ -420,7 +420,7 @@
ResultCallback disconnect_callback;
capability_->bearer_path_ = "/foo";
EXPECT_CALL(*modem_simple_proxy_,
- Disconnect(_, _, _, CellularCapability::kTimeoutDefault))
+ Disconnect(_, _, _, CellularCapability::kTimeoutDisconnect))
.Times(0);
ReleaseCapabilityProxies();
capability_->Disconnect(&error, disconnect_callback);
diff --git a/cellular_unittest.cc b/cellular_unittest.cc
index 373f6e5..6c90b3c 100644
--- a/cellular_unittest.cc
+++ b/cellular_unittest.cc
@@ -611,7 +611,7 @@
device_->state_ = Cellular::kStateConnected;
EXPECT_CALL(*proxy_,
- Disconnect(_, _, CellularCapability::kTimeoutDefault))
+ Disconnect(_, _, CellularCapability::kTimeoutDisconnect))
.WillOnce(Invoke(this, &CellularTest::InvokeDisconnect));
GetCapabilityClassic()->proxy_.reset(proxy_.release());
device_->Disconnect(&error);
@@ -625,7 +625,7 @@
Error error;
device_->state_ = Cellular::kStateConnected;
EXPECT_CALL(*proxy_,
- Disconnect(_, _, CellularCapability::kTimeoutDefault))
+ Disconnect(_, _, CellularCapability::kTimeoutDisconnect))
.Times(2)
.WillRepeatedly(Invoke(this, &CellularTest::InvokeDisconnectFail));
GetCapabilityClassic()->proxy_.reset(proxy_.release());
@@ -704,7 +704,7 @@
TEST_F(CellularTest, ModemStateChangeDisable) {
EXPECT_CALL(*proxy_,
- Disconnect(_, _, CellularCapability::kTimeoutDefault))
+ Disconnect(_, _, CellularCapability::kTimeoutDisconnect))
.WillOnce(Invoke(this, &CellularTest::InvokeDisconnect));
EXPECT_CALL(*proxy_,
Enable(false, _, _, CellularCapability::kTimeoutEnable))
@@ -802,7 +802,7 @@
CellularCapability::kTimeoutConnect))
.WillRepeatedly(Invoke(this, &CellularTest::InvokeConnect));
EXPECT_CALL(*proxy_,
- Disconnect(_, _, CellularCapability::kTimeoutDefault))
+ Disconnect(_, _, CellularCapability::kTimeoutDisconnect))
.WillOnce(Invoke(this, &CellularTest::InvokeDisconnect));
// TestCallback() will be called when the termination actions complete. This