summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfumingwei <[email protected]>2023-05-12 15:34:04 +0800
committerfumingwei <[email protected]>2023-05-12 15:34:04 +0800
commita411e87fd7349d6183da2c9d0ed2512018ef2052 (patch)
treea08ad58886c96fd3966474152212744bda92fa26
parente414bbf8a5255b6af6f22a3fd99331aec239c8c8 (diff)
bugfix:修复测试用例不通过的bugv3.0.3
-rw-r--r--test/src/gtest_fieldstat_interface.cpp6
-rw-r--r--test/src/gtest_fieldstat_output.cpp17
-rw-r--r--test/src/gtest_fieldstat_output_file_instance.cpp6
3 files changed, 19 insertions, 10 deletions
diff --git a/test/src/gtest_fieldstat_interface.cpp b/test/src/gtest_fieldstat_interface.cpp
index 58a5128..8954099 100644
--- a/test/src/gtest_fieldstat_interface.cpp
+++ b/test/src/gtest_fieldstat_interface.cpp
@@ -379,9 +379,10 @@ TEST(FeildStatAPI, SetMetricRatioPara)
ret = system("cat /dev/null > /tmp/metrics.out");
EXPECT_EQ(0, ret);
fieldstat_instance_start(instance);
+ sleep(1);
fieldstat_value_incrby(instance, output_metric_ids[3], 1000);
fieldstat_value_incrby(instance, output_metric_ids[4], 10);
- sleep(3);
+ sleep(2);
fp = fopen("/tmp/fieldstat.txt", "r");
EXPECT_NE(nullptr, fp);
@@ -481,9 +482,10 @@ TEST(FeildStatAPI, SetMetricInvisible)
ret = system("cat /dev/null > /tmp/metrics.out");
EXPECT_EQ(0, ret);
fieldstat_instance_start(instance);
+ sleep(1);
fieldstat_value_incrby(instance, output_metric_ids[3], 1000);
fieldstat_value_incrby(instance, output_metric_ids[4], 10);
- sleep(3);
+ sleep(2);
fp = fopen("/tmp/fieldstat.txt", "r");
EXPECT_NE(nullptr, fp);
diff --git a/test/src/gtest_fieldstat_output.cpp b/test/src/gtest_fieldstat_output.cpp
index 852ad10..1ef27d5 100644
--- a/test/src/gtest_fieldstat_output.cpp
+++ b/test/src/gtest_fieldstat_output.cpp
@@ -71,8 +71,9 @@ TEST(FeildStatOutput, OutputFile)
ret = fieldstat_set_local_output(instance, output_file_path, "default");
EXPECT_EQ(0, ret);
fieldstat_instance_start(instance);
+ sleep(1);
fieldstat_value_incrby(instance, output_metric_ids[0], 1000);
- sleep(3);
+ sleep(2);
fp = fopen(output_file_path, "r");
EXPECT_NE(nullptr, fp);
int n_line = 0;
@@ -152,9 +153,10 @@ TEST(FeildStatOutput, OutputLineProtocol)
EXPECT_EQ(0, ret);
EXPECT_EQ(4, instance->output_type);
fieldstat_instance_start(instance);
- fieldstat_value_incrby(instance, output_metric_ids[0], 1000);
ret = system("cat /dev/null > /tmp/metrics.out");
- sleep(3);
+ sleep(1);
+ fieldstat_value_incrby(instance, output_metric_ids[0], 1000);
+ sleep(2);
fp = fopen(telegraf_output_file, "r");
EXPECT_NE(nullptr, fp);
int n_line = 0;
@@ -339,8 +341,9 @@ TEST(FeildStatOutput, OutputFileAndLineProtocol)
ret = system("cat /dev/null > /tmp/metrics.out");
//ret = system("cat /dev/null > /tmp/fieldstat.txt");
fieldstat_instance_start(instance);
+ sleep(1);
fieldstat_value_incrby(instance, output_metric_ids[0], 1000);
- sleep(3);
+ sleep(2);
int n_line = 0;
fp = fopen(telegraf_output_file, "r");
EXPECT_NE(nullptr, fp);
@@ -477,8 +480,9 @@ TEST(FeildStatOutput, OutputFileAndPrometheus)
ret = system("cat /dev/null > /tmp/prometheus.txt");
//ret = system("cat /dev/null > /tmp/fieldstat.txt");
fieldstat_instance_start(instance);
+ sleep(1);
fieldstat_value_incrby(instance, output_metric_ids[0], 1000);
- sleep(3);
+ sleep(2);
system("curl -s http://127.0.0.1:9021/metrics -o /tmp/prometheus.txt");
int n_line = 0;
@@ -625,8 +629,9 @@ TEST(FeildStatOutput, OutputFileAndPrometheusAndLineProtocol)
ret = system("cat /dev/null > /tmp/prometheus.txt");
//ret = system("cat /dev/null > /tmp/fieldstat.txt");
fieldstat_instance_start(instance);
+ sleep(1);
fieldstat_value_incrby(instance, output_metric_ids[0], 1000);
- sleep(3);
+ sleep(2);
system("curl -s http://127.0.0.1:9022/metrics -o /tmp/prometheus.txt");
int n_line = 0;
diff --git a/test/src/gtest_fieldstat_output_file_instance.cpp b/test/src/gtest_fieldstat_output_file_instance.cpp
index 3a171de..5f3a962 100644
--- a/test/src/gtest_fieldstat_output_file_instance.cpp
+++ b/test/src/gtest_fieldstat_output_file_instance.cpp
@@ -123,8 +123,9 @@ TEST(FeildStatOutput, OutputMaatTable)
ret = fieldstat_set_local_output(instance, output_file_path, "default");
EXPECT_EQ(0, ret);
fieldstat_instance_start(instance);
+ sleep(1);
fieldstat_value_incrby(instance, output_metric_ids[0], 9223372036854775807);
- sleep(3);
+ sleep(2);
fp = fopen("/tmp/fieldstat.txt", "r");
EXPECT_NE(nullptr, fp);
@@ -205,8 +206,9 @@ TEST(FeildStatOutput, OutputMaatGaugeType)
ret = fieldstat_set_local_output(instance, output_file_path, "default");
EXPECT_EQ(0, ret);
fieldstat_instance_start(instance);
+ sleep(1);
fieldstat_value_incrby(instance, 0, 922);
- sleep(3);
+ sleep(2);
fp = fopen("/tmp/fieldstat.txt", "r");
EXPECT_NE(nullptr, fp);