Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Verify that service cluster is set in case LS tracing is enabled #383

Merged
merged 7 commits into from
Feb 6, 2017
Merged

Verify that service cluster is set in case LS tracing is enabled #383

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
29d9642
Fail on missing --service-cluster if LightStep tracing is defined.
RomanDzhabarov Jan 27, 2017
e696343
'.'
RomanDzhabarov Jan 27, 2017
3db5872
Merge branch 'master' into verify_service_cluster
RomanDzhabarov Feb 3, 2017
d4d200c
test.
RomanDzhabarov Feb 3, 2017
f1aab31
add test to cover missing cluster.
RomanDzhabarov Feb 4, 2017
15b5442
comment.
RomanDzhabarov Feb 6, 2017
69f8214
add more tests for upsupported driver
RomanDzhabarov Feb 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions test/server/configuration_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

using testing::InSequence;
using testing::Return;
using testing::ReturnRef;

namespace Server {
namespace Configuration {
Expand Down Expand Up @@ -119,5 +120,38 @@ TEST(ConfigurationImplTest, BadListenerConfig) {
EXPECT_THROW(config.initialize(*loader), Json::Exception);
}

TEST(ConfigurationImplTest, NotSetServiceClusterWhenLSTracing) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ServiceClusterNotSetWhenLSTracing

std::string json = R"EOF(
{
"listeners" : [
{
"port" : 1234,
"filters": []
}
],
"cluster_manager": {
"clusters": []
},
"tracing": {
"http": {
"driver": {
"type": "lightstep",
"access_token_file": "/etc/envoy/envoy.cfg"
}
}
}
}
)EOF";

Json::ObjectPtr loader = Json::Factory::LoadFromString(json);

NiceMock<Server::MockInstance> server;
std::string cluster_not_set = "";
EXPECT_CALL(server.local_info_, clusterName()).WillOnce(ReturnRef(cluster_not_set));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just modify server.local_info_.cluster_name_ directly. You don't need a new variable or the EXPECT_CALL.


MainImpl config(server);
EXPECT_THROW(config.initialize(*loader), EnvoyException);
}

} // Configuration
} // Server