Module: Increase StopTimeout to 2000 ms

We need to expect longer time, because we need to wait for Queue
unregistration (next patch) to be done during module shutdown

Bug: 150174451
Bug: 150054218
Test: bluetooth_test_gd
Change-Id: If8a45b2df2f2210884e0901029c151c80fab0684

diff --git a/gd/module.cc b/gd/module.cc
index a0fc31a..2136b82 100644 (file)
--- a/gd/module.cc
+++ b/gd/module.cc
@@ -21,7 +21,7 @@ using ::bluetooth::os::Thread;
 
 namespace bluetooth {
 
-constexpr std::chrono::milliseconds kModuleStopTimeout = std::chrono::milliseconds(20);
+constexpr std::chrono::milliseconds kModuleStopTimeout = std::chrono::milliseconds(2000);
 
 ModuleFactory::ModuleFactory(std::function<Module*()> ctor) : ctor_(ctor) {
 }

diff --git a/gd/module_unittest.cc b/gd/module_unittest.cc
index 5d9564f..1ee1a8d 100644 (file)
--- a/gd/module_unittest.cc
+++ b/gd/module_unittest.cc
@@ -59,7 +59,6 @@ class TestModuleNoDependency : public Module {
 
   void Stop() override {
     // A module is not considered stopped until after Stop() finishes
-    test_module_no_dependency_handler = nullptr;
     EXPECT_TRUE(GetModuleRegistry()->IsStarted<TestModuleNoDependency>());
   }
 };
@@ -88,7 +87,6 @@ class TestModuleOneDependency : public Module {
   }
 
   void Stop() override {
-    test_module_one_dependency_handler = GetHandler();
     EXPECT_TRUE(GetModuleRegistry()->IsStarted<TestModuleNoDependency>());
 
     // A module is not considered stopped until after Stop() finishes