Skip to content

Commit

Permalink
Merge branch 'master' into datadog-api-spec/generated/1433
Browse files Browse the repository at this point in the history
  • Loading branch information
anthonypalmeira authored Jan 21, 2022
2 parents a42da8f + f1ae477 commit c87531a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions tests/scenarios/features/v1/logs.feature
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ Feature: Logs
When the request is sent
Then the response status is 200 OK

@integration-only @skip-terraform-config @team:DataDog/logs-intake
@integration-only @skip-validation @skip-terraform-config @team:DataDog/logs-intake
Scenario: Send deflate logs returns "Response from server (always 200 empty JSON)." response
Given new "SubmitLog" request
And body with value [{"message": "{{ unique }}", "ddtags": "host:{{ unique_alnum }}"}]
And request contains "Content-Encoding" parameter with value "deflate"
When the request is sent
Then the response status is 200 Response from server (always 200 empty JSON).

@integration-only @skip-terraform-config @team:DataDog/logs-intake
@integration-only @skip-validation @skip-terraform-config @team:DataDog/logs-intake
Scenario: Send gzip logs returns "Response from server (always 200 empty JSON)." response
Given new "SubmitLog" request
And body with value [{"message": "{{ unique }}", "ddtags": "host:{{ unique_alnum }}"}]
Expand Down
4 changes: 2 additions & 2 deletions tests/scenarios/features/v2/logs.feature
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ Feature: Logs
When the request is sent
Then the response status is 200 OK

@integration-only @skip-terraform-config @team:DataDog/logs-backend @team:DataDog/logs-intake
@integration-only @skip-validation @skip-terraform-config @team:DataDog/logs-backend @team:DataDog/logs-intake
Scenario: Send deflate logs returns "Request accepted for processing (always 202 empty JSON)." response
Given new "SubmitLog" request
And body with value [{"ddsource": "nginx", "ddtags": "env:staging,version:5.1", "hostname": "i-012345678", "message": "2019-11-19T14:37:58,995 INFO [process.name][20081] Hello World", "service": "payment"}]
And request contains "Content-Encoding" parameter with value "deflate"
When the request is sent
Then the response status is 202 Response from server (always 202 empty JSON).

@integration-only @skip-terraform-config @team:DataDog/logs-backend @team:DataDog/logs-intake
@integration-only @skip-validation @skip-terraform-config @team:DataDog/logs-backend @team:DataDog/logs-intake
Scenario: Send gzip logs returns "Request accepted for processing (always 202 empty JSON)." response
Given new "SubmitLog" request
And body with value [{"ddsource": "nginx", "ddtags": "env:staging,version:5.1", "hostname": "i-012345678", "message": "2019-11-19T14:37:58,995 INFO [process.name][20081] Hello World", "service": "payment"}]
Expand Down

0 comments on commit c87531a

Please sign in to comment.