Skip to content

Commit 85435d3

Browse files
authored
Update client test due to disabling dynamic trace file (#579)
1 parent efbe8ea commit 85435d3

File tree

1 file changed

+27
-15
lines changed

1 file changed

+27
-15
lines changed

src/c++/tests/cc_client_test.cc

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ class HTTPTraceTest : public ::testing::Test {
173173
std::string response;
174174

175175
std::map<std::string, std::vector<std::string>> clear_settings = {
176-
{"trace_file", {}},
177176
{"trace_level", {}},
178177
{"trace_rate", {}},
179178
{"trace_count", {}},
@@ -247,7 +246,6 @@ class GRPCTraceTest : public ::testing::Test {
247246
inference::TraceSettingResponse response;
248247

249248
std::map<std::string, std::vector<std::string>> clear_settings = {
250-
{"trace_file", {}},
251249
{"trace_level", {}},
252250
{"trace_rate", {}},
253251
{"trace_count", {}},
@@ -1363,27 +1361,35 @@ TEST_F(HTTPTraceTest, HTTPUpdateTraceSettings)
13631361

13641362
std::string expected_first_model_settings =
13651363
"{\"trace_level\":[\"TIMESTAMPS\"],\"trace_rate\":\"1\",\"trace_count\":"
1366-
"\"-1\",\"log_frequency\":\"0\",\"trace_file\":\"model.log\",\"trace_"
1364+
"\"-1\",\"log_frequency\":\"0\",\"trace_file\":\"global_unittest.log\","
1365+
"\"trace_"
13671366
"mode\":\"triton\"}";
13681367
std::string expected_second_model_settings =
13691368
"{\"trace_level\":[\"TIMESTAMPS\",\"TENSORS\"],\"trace_rate\":\"1\","
1370-
"\"trace_count\":\"-1\",\"log_frequency\":\"0\",\"trace_file\":\"model."
1369+
"\"trace_count\":\"-1\",\"log_frequency\":\"0\",\"trace_file\":\"global_"
1370+
"unittest."
13711371
"log\",\"trace_mode\":\"triton\"}";
13721372
std::string expected_global_settings =
13731373
"{\"trace_level\":[\"TIMESTAMPS\",\"TENSORS\"],\"trace_rate\":\"1\","
1374-
"\"trace_count\":\"-1\",\"log_frequency\":\"0\",\"trace_file\":\"another."
1374+
"\"trace_count\":\"-1\",\"log_frequency\":\"0\",\"trace_file\":\"global_"
1375+
"unittest."
13751376
"log\",\"trace_mode\":\"triton\"}";
13761377

13771378
std::map<std::string, std::vector<std::string>> model_update_settings = {
13781379
{"trace_file", {"model.log"}}};
13791380
std::map<std::string, std::vector<std::string>> global_update_settings = {
1380-
{"trace_file", {"another.log"}},
13811381
{"trace_level", {"TIMESTAMPS", "TENSORS"}}};
13821382

13831383
err = this->client_->UpdateTraceSettings(
13841384
&trace_settings, this->model_name_, model_update_settings);
1385-
ASSERT_TRUE(err.IsOk()) << "unable to update trace settings: "
1386-
<< err.Message();
1385+
ASSERT_FALSE(err.IsOk()) << "update disabled settings: trace_file";
1386+
ASSERT_TRUE(
1387+
err.Message() ==
1388+
"trace file location can not be updated through network protocol")
1389+
<< "error: Unexpected error message: " << err.Message();
1390+
1391+
err = this->client_->GetTraceSettings(&trace_settings, this->model_name_);
1392+
ASSERT_TRUE(err.IsOk()) << "unable to get trace settings: " << err.Message();
13871393
ASSERT_EQ(trace_settings, expected_first_model_settings)
13881394
<< "error: Unexpected updated model trace settings" << std::endl;
13891395
// Note that 'trace_level' may be mismatch due to the order of the levels
@@ -1490,35 +1496,41 @@ TEST_F(GRPCTraceTest, GRPCUpdateTraceSettings)
14901496
std::string expected_first_model_settings =
14911497
"settings{key:\"log_frequency\"value{value:\"0\"}}settings{key:\"trace_"
14921498
"count\"value{value:\"-1\"}}settings{key:\"trace_file\"value{value:"
1493-
"\"model.log\"}}settings{key:\"trace_level\"value{value:\"TIMESTAMPS\"}}"
1499+
"\"global_unittest.log\"}}settings{key:\"trace_level\"value{value:"
1500+
"\"TIMESTAMPS\"}}"
14941501
"settings{key:\"trace_mode\"value{value:\"triton\"}}"
14951502
"settings{key:\"trace_rate\"value{value:\"1\"}}";
14961503
std::string expected_second_model_settings =
14971504
"settings{key:\"log_frequency\"value{value:\"0\"}}settings{key:\"trace_"
14981505
"count\"value{value:\"-1\"}}settings{key:\"trace_file\"value{value:"
1499-
"\"model.log\"}}settings{key:\"trace_level\"value{value:"
1506+
"\"global_unittest.log\"}}settings{key:\"trace_level\"value{value:"
15001507
"\"TIMESTAMPS\"value:\"TENSORS\"}}settings{key:\"trace_mode\"value{value:"
15011508
"\"triton\"}}"
15021509
"settings{key:\"trace_rate\"value{value:\"1\"}}";
15031510
std::string expected_global_settings =
15041511
"settings{key:\"log_frequency\"value{value:\"0\"}}settings{key:\"trace_"
15051512
"count\"value{value:\"-1\"}}settings{key:\"trace_file\"value{value:"
1506-
"\"another.log\"}}settings{key:\"trace_level\"value{value:"
1513+
"\"global_unittest.log\"}}settings{key:\"trace_level\"value{value:"
15071514
"\"TIMESTAMPS\"value:\"TENSORS\"}}settings{key:\"trace_mode\"value{value:"
15081515
"\"triton\"}}"
15091516
"settings{key:\"trace_rate\"value{value:\"1\"}}";
15101517

15111518
std::map<std::string, std::vector<std::string>> model_update_settings = {
15121519
{"trace_file", {"model.log"}}};
15131520
std::map<std::string, std::vector<std::string>> global_update_settings = {
1514-
{"trace_file", {"another.log"}},
15151521
{"trace_level", {"TIMESTAMPS", "TENSORS"}}};
15161522

15171523

15181524
err = this->client_->UpdateTraceSettings(
15191525
&response, this->model_name_, model_update_settings);
1520-
ASSERT_TRUE(err.IsOk()) << "unable to update trace settings: "
1521-
<< err.Message();
1526+
ASSERT_FALSE(err.IsOk()) << "update disabled settings: trace_file";
1527+
ASSERT_TRUE(
1528+
err.Message() ==
1529+
"trace file location can not be updated through network protocol")
1530+
<< "error: Unexpected error message: " << err.Message();
1531+
1532+
err = this->client_->GetTraceSettings(&response, this->model_name_);
1533+
ASSERT_TRUE(err.IsOk()) << "unable to get trace settings: " << err.Message();
15221534
EXPECT_NO_FATAL_FAILURE(ConvertResponse(response, &trace_settings));
15231535
ASSERT_EQ(trace_settings, expected_first_model_settings)
15241536
<< "error: Unexpected updated model trace settings" << std::endl;
@@ -1534,7 +1546,7 @@ TEST_F(GRPCTraceTest, GRPCUpdateTraceSettings)
15341546
ASSERT_EQ(trace_settings, expected_global_settings)
15351547
<< "error: Unexpected updated global trace settings" << std::endl;
15361548

1537-
err = client_->GetTraceSettings(&response, this->model_name_);
1549+
err = this->client_->GetTraceSettings(&response, this->model_name_);
15381550
ASSERT_TRUE(err.IsOk()) << "unable to get trace settings: " << err.Message();
15391551
EXPECT_NO_FATAL_FAILURE(ConvertResponse(response, &trace_settings));
15401552
ASSERT_EQ(trace_settings, expected_second_model_settings)

0 commit comments

Comments
 (0)