tests/system: fix system tests (#5037)

axw · web-flow · commit 0e09aa69022b · 2021-03-31T11:45:46.000+08:00
* tests/system: adapt to new API response In elastic/kibana#95146 the response structure for listing APM agent central config changed. Update system tests to match. * tests/system: add user_agent.device.type elastic/elasticsearch#69322 added support for extracting device types to the user_agent ingest processors. Update approvals to match.
diff --git a/docs/data/elasticsearch/generated/errors.json b/docs/data/elasticsearch/generated/errors.json
@@ -407,7 +407,8 @@
         },
         "user_agent": {
             "device": {
-                "name": "Other"
+                "name": "Other",
+                "type": "Other"
             },
             "name": "Other",
             "original": "Mozilla Chrome Edge"
diff --git a/docs/data/elasticsearch/generated/transactions.json b/docs/data/elasticsearch/generated/transactions.json
@@ -497,10 +497,11 @@
         },
         "user_agent": {
             "device": {
-                "name": "Other"
+                "name": "Other",
+                "type": "Other"
             },
             "name": "Other",
             "original": "Mozilla Chrome Edge"
         }
     }
-]
+]
diff --git a/systemtest/approvals/TestRUMErrorSourcemapping.approved.json b/systemtest/approvals/TestRUMErrorSourcemapping.approved.json
@@ -302,7 +302,8 @@
             },
             "user_agent": {
                 "device": {
-                    "name": "Other"
+                    "name": "Other",
+                    "type": "Other"
                 },
                 "name": "Go-http-client",
                 "original": "Go-http-client/1.1",
diff --git a/systemtest/approvals/TestRUMXForwardedFor.approved.json b/systemtest/approvals/TestRUMXForwardedFor.approved.json
@@ -65,7 +65,8 @@
             },
             "user_agent": {
                 "device": {
-                    "name": "Other"
+                    "name": "Other",
+                    "type": "Other"
                 },
                 "name": "Go-http-client",
                 "original": "Go-http-client/1.1",
diff --git a/tests/system/error.approved.json b/tests/system/error.approved.json
@@ -407,7 +407,8 @@
         },
         "user_agent": {
             "device": {
-                "name": "Other"
+                "name": "Other",
+                "type": "Other"
             },
             "name": "Other",
             "original": "Mozilla Chrome Edge"
diff --git a/tests/system/kibana.py b/tests/system/kibana.py
@@ -61,7 +61,7 @@ def list_agent_config(self):
             }
         )
         assert resp.status_code == 200, resp.status_code
-        return resp.json()
+        return resp.json()['configurations']
 
     def delete_agent_config(self, service, env=None):
         data = {
diff --git a/tests/system/transaction.approved.json b/tests/system/transaction.approved.json
@@ -497,10 +497,11 @@
         },
         "user_agent": {
             "device": {
-                "name": "Other"
+                "name": "Other",
+                "type": "Other"
             },
             "name": "Other",
             "original": "Mozilla Chrome Edge"
         }
     }
-]
+]

Original file line number	Diff line number	Diff line change
`@@ -497,10 +497,11 @@`
`497`	`497`	`},`
`498`	`498`	`"user_agent": {`
`499`	`499`	`"device": {`
`500`		`- "name": "Other"`
	`500`	`+ "name": "Other",`
	`501`	`+ "type": "Other"`
`501`	`502`	`},`
`502`	`503`	`"name": "Other",`
`503`	`504`	`"original": "Mozilla Chrome Edge"`
`504`	`505`	`}`
`505`	`506`	`}`
`506`		`-]`
	`507`	`+]`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ def list_agent_config(self):`
`61`	`61`	`}`
`62`	`62`	`)`
`63`	`63`	`assert resp.status_code == 200, resp.status_code`
`64`		`- return resp.json()`
	`64`	`+ return resp.json()['configurations']`
`65`	`65`
`66`	`66`	`def delete_agent_config(self, service, env=None):`
`67`	`67`	`data = {`