Skip to content

Commit

Permalink
fix cli samples and tests (#647)
Browse files Browse the repository at this point in the history
  • Loading branch information
@schoren
schoren committed Jun 2, 2022
1 parent f192691 commit b970d04
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 24 deletions.
1 change: 0 additions & 1 deletion api/http.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ components:
$ref: "#/components/schemas/HTTPHeader"
body:
type: string
format: byte

HTTPAuth:
type: object
Expand Down
3 changes: 0 additions & 3 deletions api/trace.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ components:
properties:
traceId:
type: string
format: byte
tree:
$ref: "#/components/schemas/Span"
flat:
Expand All @@ -20,10 +19,8 @@ components:
properties:
id:
type: string
format: byte
parentId:
type: string
format: byte
name:
type: string
startTime:
Expand Down
20 changes: 10 additions & 10 deletions cli/file/definition_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,32 +39,32 @@ func TestLoadDefinition(t *testing.T) {
},
TestDefinition: []definition.TestDefinition{
{
Selector: "span[span.name = \"POST /pokemon/import\"]",
Selector: "span[name = \"POST /pokemon/import\"]",
Assertions: []string{
"tracetest.span.duration <= 100",
"http.status_code = 200",
},
},
{
Selector: "span[span.name = \"send message to queue\"]",
Selector: "span[name = \"send message to queue\"]",
Assertions: []string{
"messaging.message.payload contains 52",
},
},
{
Selector: "span[span.name = \"consume message from queue\"]:last",
Selector: "span[name = \"consume message from queue\"]:last",
Assertions: []string{
"messaging.message.payload contains 52",
},
},
{
Selector: "span[span.name = \"consume message from queue\"]:last span[span.name = \"import pokemon from pokeapi\"]",
Selector: "span[name = \"consume message from queue\"]:last span[name = \"import pokemon from pokeapi\"]",
Assertions: []string{
"http.status_code = 200",
},
},
{
Selector: "span[span.name = \"consume message from queue\"]:last span[span.name = \"save pokemon on database\"]",
Selector: "span[name = \"consume message from queue\"]:last span[name = \"save pokemon on database\"]",
Assertions: []string{
"db.repository.operation = \"create\"",
"tracetest.span.duration <= 100",
Expand Down Expand Up @@ -97,32 +97,32 @@ func TestLoadDefinition(t *testing.T) {
},
TestDefinition: []definition.TestDefinition{
{
Selector: "span[span.name = \"POST /pokemon/import\"]",
Selector: "span[name = \"POST /pokemon/import\"]",
Assertions: []string{
"tracetest.span.duration <= 100",
"http.status_code = 200",
},
},
{
Selector: "span[span.name = \"send message to queue\"]",
Selector: "span[name = \"send message to queue\"]",
Assertions: []string{
"messaging.message.payload contains 52",
},
},
{
Selector: "span[span.name = \"consume message from queue\"]:last",
Selector: "span[name = \"consume message from queue\"]:last",
Assertions: []string{
"messaging.message.payload contains 52",
},
},
{
Selector: "span[span.name = \"consume message from queue\"]:last span[span.name = \"import pokemon from pokeapi\"]",
Selector: "span[name = \"consume message from queue\"]:last span[name = \"import pokemon from pokeapi\"]",
Assertions: []string{
"http.status_code = 200",
},
},
{
Selector: "span[span.name = \"consume message from queue\"]:last span[span.name = \"save pokemon on database\"]",
Selector: "span[name = \"consume message from queue\"]:last span[name = \"save pokemon on database\"]",
Assertions: []string{
"db.repository.operation = \"create\"",
"tracetest.span.duration <= 100",
Expand Down
10 changes: 5 additions & 5 deletions cli/testdata/definitions/valid_http_test_definition.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@ trigger:
type: raw
raw: '{ "id": 52 }'
testDefinition:
- selector: span[span.name = "POST /pokemon/import"]
- selector: span[name = "POST /pokemon/import"]
assertions:
- tracetest.span.duration <= 100
- http.status_code = 200
- selector: span[span.name = "send message to queue"]
- selector: span[name = "send message to queue"]
assertions:
- messaging.message.payload contains 52
- selector: span[span.name = "consume message from queue"]:last
- selector: span[name = "consume message from queue"]:last
assertions:
- messaging.message.payload contains 52
- selector: span[span.name = "consume message from queue"]:last span[span.name = "import
- selector: span[name = "consume message from queue"]:last span[name = "import
pokemon from pokeapi"]
assertions:
- http.status_code = 200
- selector: span[span.name = "consume message from queue"]:last span[span.name = "save
- selector: span[name = "consume message from queue"]:last span[name = "save
pokemon on database"]
assertions:
- db.repository.operation = "create"
Expand Down
10 changes: 5 additions & 5 deletions cli/testdata/definitions/valid_http_test_definition_with_id.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ trigger:
type: raw
raw: '{ "id": 52 }'
testDefinition:
- selector: span[span.name = "POST /pokemon/import"]
- selector: span[name = "POST /pokemon/import"]
assertions:
- tracetest.span.duration <= 100
- http.status_code = 200
- selector: span[span.name = "send message to queue"]
- selector: span[name = "send message to queue"]
assertions:
- messaging.message.payload contains 52
- selector: span[span.name = "consume message from queue"]:last
- selector: span[name = "consume message from queue"]:last
assertions:
- messaging.message.payload contains 52
- selector: span[span.name = "consume message from queue"]:last span[span.name = "import pokemon from pokeapi"]
- selector: span[name = "consume message from queue"]:last span[name = "import pokemon from pokeapi"]
assertions:
- http.status_code = 200
- selector: span[span.name = "consume message from queue"]:last span[span.name = "save pokemon on database"]
- selector: span[name = "consume message from queue"]:last span[name = "save pokemon on database"]
assertions:
- db.repository.operation = "create"
- tracetest.span.duration <= 100

0 comments on commit b970d04

Please sign in to comment.