Skip to content

Commit c791606

Browse files
indrajit96indrajit96
authored
Update client-side trace tests to check for newly returned trace mode (#568)
* Update client TC for Get Trace Settings HTTP and GRPC call * Order fixed in GRPC response testcase
1 parent f0936f4 commit c791606

File tree

1 file changed

+26
-15
lines changed

1 file changed

+26
-15
lines changed

‎src/c++/tests/cc_client_test.cc‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ class HTTPTraceTest : public ::testing::Test {
197197
std::string initial_settings =
198198
"{\"trace_level\":[\"TIMESTAMPS\"],\"trace_rate\":\"1\",\"trace_"
199199
"count\":\"-1\",\"log_frequency\":\"0\",\"trace_file\":\"global_"
200-
"unittest.log\"}";
200+
"unittest.log\",\"trace_mode\":\"triton\"}";
201201

202202
err = client_->GetTraceSettings(&trace_settings, model_name_);
203203
ASSERT_TRUE(err.IsOk())
@@ -273,7 +273,8 @@ class GRPCTraceTest : public ::testing::Test {
273273
"settings{key:\"log_frequency\"value{value:\"0\"}}settings{key:\"trace_"
274274
"count\"value{value:\"-1\"}}settings{key:\"trace_file\"value{value:"
275275
"\"global_unittest.log\"}}settings{key:\"trace_level\"value{value:"
276-
"\"TIMESTAMPS\"}}settings{key:\"trace_rate\"value{value:\"1\"}}";
276+
"\"TIMESTAMPS\"}}settings{key:\"trace_mode\"value{value:\"triton\"}}"
277+
"settings{key:\"trace_rate\"value{value:\"1\"}}";
277278
err = client_->GetTraceSettings(&response, model_name_);
278279
ASSERT_TRUE(err.IsOk())
279280
<< "unable to get trace settings: " << err.Message();
@@ -1362,15 +1363,16 @@ TEST_F(HTTPTraceTest, HTTPUpdateTraceSettings)
13621363

13631364
std::string expected_first_model_settings =
13641365
"{\"trace_level\":[\"TIMESTAMPS\"],\"trace_rate\":\"1\",\"trace_count\":"
1365-
"\"-1\",\"log_frequency\":\"0\",\"trace_file\":\"model.log\"}";
1366+
"\"-1\",\"log_frequency\":\"0\",\"trace_file\":\"model.log\",\"trace_"
1367+
"mode\":\"triton\"}";
13661368
std::string expected_second_model_settings =
13671369
"{\"trace_level\":[\"TIMESTAMPS\",\"TENSORS\"],\"trace_rate\":\"1\","
13681370
"\"trace_count\":\"-1\",\"log_frequency\":\"0\",\"trace_file\":\"model."
1369-
"log\"}";
1371+
"log\",\"trace_mode\":\"triton\"}";
13701372
std::string expected_global_settings =
13711373
"{\"trace_level\":[\"TIMESTAMPS\",\"TENSORS\"],\"trace_rate\":\"1\","
13721374
"\"trace_count\":\"-1\",\"log_frequency\":\"0\",\"trace_file\":\"another."
1373-
"log\"}";
1375+
"log\",\"trace_mode\":\"triton\"}";
13741376

13751377
std::map<std::string, std::vector<std::string>> model_update_settings = {
13761378
{"trace_file", {"model.log"}}};
@@ -1430,13 +1432,16 @@ TEST_F(HTTPTraceTest, HTTPClearTraceSettings)
14301432

14311433
std::string expected_global_settings =
14321434
"{\"trace_level\":[\"OFF\"],\"trace_rate\":\"1\",\"trace_count\":\"-1\","
1433-
"\"log_frequency\":\"0\",\"trace_file\":\"global_unittest.log\"}";
1435+
"\"log_frequency\":\"0\",\"trace_file\":\"global_unittest.log\",\"trace_"
1436+
"mode\":\"triton\"}";
14341437
std::string expected_first_model_settings =
14351438
"{\"trace_level\":[\"OFF\"],\"trace_rate\":\"12\",\"trace_count\":\"-1\","
1436-
"\"log_frequency\":\"34\",\"trace_file\":\"global_unittest.log\"}";
1439+
"\"log_frequency\":\"34\",\"trace_file\":\"global_unittest.log\",\"trace_"
1440+
"mode\":\"triton\"}";
14371441
std::string expected_second_model_settings =
14381442
"{\"trace_level\":[\"OFF\"],\"trace_rate\":\"1\",\"trace_count\":\"-1\","
1439-
"\"log_frequency\":\"34\",\"trace_file\":\"global_unittest.log\"}";
1443+
"\"log_frequency\":\"34\",\"trace_file\":\"global_unittest.log\",\"trace_"
1444+
"mode\":\"triton\"}";
14401445
std::map<std::string, std::vector<std::string>> global_clear_settings = {
14411446
{"trace_rate", {}}, {"trace_count", {}}};
14421447
std::map<std::string, std::vector<std::string>> model_clear_settings = {
@@ -1486,19 +1491,22 @@ TEST_F(GRPCTraceTest, GRPCUpdateTraceSettings)
14861491
"settings{key:\"log_frequency\"value{value:\"0\"}}settings{key:\"trace_"
14871492
"count\"value{value:\"-1\"}}settings{key:\"trace_file\"value{value:"
14881493
"\"model.log\"}}settings{key:\"trace_level\"value{value:\"TIMESTAMPS\"}}"
1494+
"settings{key:\"trace_mode\"value{value:\"triton\"}}"
14891495
"settings{key:\"trace_rate\"value{value:\"1\"}}";
14901496
std::string expected_second_model_settings =
14911497
"settings{key:\"log_frequency\"value{value:\"0\"}}settings{key:\"trace_"
14921498
"count\"value{value:\"-1\"}}settings{key:\"trace_file\"value{value:"
14931499
"\"model.log\"}}settings{key:\"trace_level\"value{value:"
1494-
"\"TIMESTAMPS\"value:\"TENSORS\"}}settings{key:\"trace_rate\"value{value:"
1495-
"\"1\"}}";
1500+
"\"TIMESTAMPS\"value:\"TENSORS\"}}settings{key:\"trace_mode\"value{value:"
1501+
"\"triton\"}}"
1502+
"settings{key:\"trace_rate\"value{value:\"1\"}}";
14961503
std::string expected_global_settings =
14971504
"settings{key:\"log_frequency\"value{value:\"0\"}}settings{key:\"trace_"
14981505
"count\"value{value:\"-1\"}}settings{key:\"trace_file\"value{value:"
14991506
"\"another.log\"}}settings{key:\"trace_level\"value{value:"
1500-
"\"TIMESTAMPS\"value:\"TENSORS\"}}settings{key:\"trace_rate\"value{value:"
1501-
"\"1\"}}";
1507+
"\"TIMESTAMPS\"value:\"TENSORS\"}}settings{key:\"trace_mode\"value{value:"
1508+
"\"triton\"}}"
1509+
"settings{key:\"trace_rate\"value{value:\"1\"}}";
15021510

15031511
std::map<std::string, std::vector<std::string>> model_update_settings = {
15041512
{"trace_file", {"model.log"}}};
@@ -1567,17 +1575,20 @@ TEST_F(GRPCTraceTest, GRPCClearTraceSettings)
15671575
"settings{key:\"log_frequency\"value{value:\"0\"}}settings{key:\"trace_"
15681576
"count\"value{value:\"-1\"}}settings{key:\"trace_file\"value{value:"
15691577
"\"global_unittest.log\"}}settings{key:\"trace_level\"value{value:"
1570-
"\"OFF\"}}settings{key:\"trace_rate\"value{value:\"1\"}}";
1578+
"\"OFF\"}}settings{key:\"trace_mode\"value{value:\"triton\"}}"
1579+
"settings{key:\"trace_rate\"value{value:\"1\"}}";
15711580
std::string expected_first_model_settings =
15721581
"settings{key:\"log_frequency\"value{value:\"34\"}}settings{key:\"trace_"
15731582
"count\"value{value:\"-1\"}}settings{key:\"trace_file\"value{value:"
15741583
"\"global_unittest.log\"}}settings{key:\"trace_level\"value{value:"
1575-
"\"OFF\"}}settings{key:\"trace_rate\"value{value:\"12\"}}";
1584+
"\"OFF\"}}settings{key:\"trace_mode\"value{value:\"triton\"}}"
1585+
"settings{key:\"trace_rate\"value{value:\"12\"}}";
15761586
std::string expected_second_model_settings =
15771587
"settings{key:\"log_frequency\"value{value:\"34\"}}settings{key:\"trace_"
15781588
"count\"value{value:\"-1\"}}settings{key:\"trace_file\"value{value:"
15791589
"\"global_unittest.log\"}}settings{key:\"trace_level\"value{value:"
1580-
"\"OFF\"}}settings{key:\"trace_rate\"value{value:\"1\"}}";
1590+
"\"OFF\"}}settings{key:\"trace_mode\"value{value:\"triton\"}}"
1591+
"settings{key:\"trace_rate\"value{value:\"1\"}}";
15811592
std::map<std::string, std::vector<std::string>> global_clear_settings = {
15821593
{"trace_rate", {}}, {"trace_count", {}}};
15831594
std::map<std::string, std::vector<std::string>> model_clear_settings = {

0 commit comments

Comments
 (0)