commit 990e6d7c53d30c62c5d958cb75610404521b4eef
author Florian Mayer <fmayer@google.com> Mon Jun 03 11:34:52 2019 +0100
committer Florian Mayer <fmayer@google.com> Mon Jun 03 11:34:52 2019 +0100
tree 58828a6e5923d4be84304b3ae04caafbe647798d
parent fc15cad3689508822ab2d0bb0200509ff35dbc8c

Allow to specify data_source_stop_timeout in TraceConfig.

Change-Id: I2d18d1a7f024a3c5e8e670bb7dc63cf62a63e622

src/tracing/core/tracing_service_impl_unittest.cc

diff --git a/src/tracing/core/tracing_service_impl_unittest.cc b/src/tracing/core/tracing_service_impl_unittest.cc
index c96d097..5935354 100644
--- a/src/tracing/core/tracing_service_impl_unittest.cc
+++ b/src/tracing/core/tracing_service_impl_unittest.cc
@@ -1843,7 +1843,6 @@
 // skips the ack and checks that the service invokes the OnTracingDisabled()
 // after the timeout.
 TEST_F(TracingServiceImplTest, OnTracingDisabledCalledAnywaysInCaseOfTimeout) {
-  svc->override_data_source_test_timeout_ms_for_testing = 1;
   std::unique_ptr<MockConsumer> consumer = CreateMockConsumer();
   consumer->Connect(svc.get());
 
@@ -1855,6 +1854,7 @@
   trace_config.add_buffers()->set_size_kb(128);
   trace_config.add_data_sources()->mutable_config()->set_name("data_source");
   trace_config.set_duration_ms(1);
+  trace_config.set_data_source_stop_timeout_ms(1);
 
   consumer->EnableTracing(trace_config);
   producer->WaitForTracingSetup();