Skip to content

Commit

Permalink
fix typo, add back missing constructor in config_provider_test
Browse files Browse the repository at this point in the history
Signed-off-by: Xin Zhuang <stevenzzz@google.com>
  • Loading branch information
stevenzzzz committed Aug 1, 2019
1 parent ee09a5b commit 46ad9af
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion source/common/router/scoped_rds.cc
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ void ScopedRdsConfigSubscription::onConfigUpdate(
rds.mutable_config_source()->MergeFrom(rds_config_source_);

// If new route config sources come after the factory_context_.initManager()'s initialize() been
// called, that initManager can't accepct new targets. Instead we use a local override which will
// called, that initManager can't accept new targets. Instead we use a local override which will
// start new subscriptions but not wait on them to be ready (to not block on main thread).
std::unique_ptr<Init::ManagerImpl> overriding_init_manager;
if (factory_context_.initManager().state() == Init::Manager::State::Initialized) {
Expand Down
1 change: 1 addition & 0 deletions test/common/config/config_provider_impl_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class DummyConfigProviderManager;

class DummyConfig : public Envoy::Config::ConfigProvider::Config {
public:
DummyConfig() {}
explicit DummyConfig(const test::common::config::DummyConfig& config_proto) {
protos_.push_back(config_proto);
}
Expand Down
1 change: 1 addition & 0 deletions test/mocks/router/mocks.cc
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ MockRouteConfigProviderManager::~MockRouteConfigProviderManager() {}
MockScopedConfig::MockScopedConfig() {
ON_CALL(*this, getRouteConfig(_)).WillByDefault(Return(route_config_));
}
MockScopedConfig::~MockScopedConfig() = default;

MockScopedRouteConfigProvider::MockScopedRouteConfigProvider()
: config_(std::make_shared<MockScopedConfig>()) {
Expand Down

0 comments on commit 46ad9af

Please sign in to comment.