update case.feature

alibaba · Oct 18, 2024 · 86e2ad1 · 86e2ad1
1 parent b55203c
commit 86e2ad1
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 28 deletions.
diff --git a/test/benchmark/test_cases/performance_file_to_blackhole_filebeat/case.feature b/test/benchmark/test_cases/performance_file_to_blackhole_filebeat/case.feature
@@ -8,12 +8,5 @@ Feature: performance file to blackhole filebeat
     Given docker-compose boot type {benchmark}
     When start docker-compose {performance_file_to_blackhole_filebeat}
     When start monitor {filebeat}
-<<<<<<< HEAD
-    When generate logs to file, speed {100}MB/s, total {1}min, to file {./a.log}, template
-    """
-    {"url": "POST /PutData?Category=YunOsAccountOpLog HTTP/1.1", "ip": "10.200.98.220", "user-agent": "aliyun-sdk-java", "request": {"status": "200", "latency": "18204"}, "time": "07/Jul/2022:10:30:28"}
-    """
-=======
     When generate random json logs to file, speed {10}MB/s, total {1}min, to file {./a.log}
     When wait monitor until log processing finished
->>>>>>> benchmark
diff --git a/test/benchmark/test_cases/performance_file_to_blackhole_fluentbit/case.feature b/test/benchmark/test_cases/performance_file_to_blackhole_fluentbit/case.feature
@@ -8,12 +8,5 @@ Feature: performance file to blackhole fluentbit
     Given docker-compose boot type {benchmark}
     When start docker-compose {performance_file_to_blackhole_fluentbit}
     When start monitor {fluent-bit}
-<<<<<<< HEAD
-    When generate logs to file, speed {100}MB/s, total {1}min, to file {./a.log}, template
-    """
-    {"url": "POST /PutData?Category=YunOsAccountOpLog HTTP/1.1", "ip": "10.200.98.220", "user-agent": "aliyun-sdk-java", "request": {"status": "200", "latency": "18204"}, "time": "07/Jul/2022:10:30:28"}
-    """
-=======
     When generate random json logs to file, speed {10}MB/s, total {1}min, to file {./a.log}
     When wait monitor until log processing finished
->>>>>>> benchmark
diff --git a/test/benchmark/test_cases/performance_file_to_blackhole_ilogtail/case.feature b/test/benchmark/test_cases/performance_file_to_blackhole_ilogtail/case.feature
@@ -8,12 +8,5 @@ Feature: performance file to blackhole iLogtail
     Given docker-compose boot type {benchmark}
     When start docker-compose {performance_file_to_blackhole_ilogtail}
     When start monitor {ilogtailC}
-<<<<<<< HEAD
-    When generate logs to file, speed {100}MB/s, total {1}min, to file {./a.log}, template
-    """
-    {"url": "POST /PutData?Category=YunOsAccountOpLog HTTP/1.1", "ip": "10.200.98.220", "user-agent": "aliyun-sdk-java", "request": {"status": "200", "latency": "18204"}, "time": "07/Jul/2022:10:30:28"}
-    """
-=======
     When generate random json logs to file, speed {10}MB/s, total {1}min, to file {./a.log}
     When wait monitor until log processing finished
->>>>>>> benchmark
diff --git a/test/benchmark/test_cases/performance_file_to_blackhole_vector/case.feature b/test/benchmark/test_cases/performance_file_to_blackhole_vector/case.feature
@@ -8,12 +8,5 @@ Feature: performance file to blackhole vector
     Given docker-compose boot type {benchmark}
     When start docker-compose {performance_file_to_blackhole_vector}
     When start monitor {vector}
-<<<<<<< HEAD
-    When generate logs to file, speed {100}MB/s, total {1}min, to file {./a.log}, template
-    """
-    {"url": "POST /PutData?Category=YunOsAccountOpLog HTTP/1.1", "ip": "10.200.98.220", "user-agent": "aliyun-sdk-java", "request": {"status": "200", "latency": "18204"}, "time": "07/Jul/2022:10:30:28"}
-    """
-=======
     When generate random json logs to file, speed {10}MB/s, total {1}min, to file {./a.log}
     When wait monitor until log processing finished
->>>>>>> benchmark