From 964ecaf0451456b096286cedc13a9acc4b091afc Mon Sep 17 00:00:00 2001 From: Paul Gevers Date: Mon, 29 Apr 2019 18:10:48 +0200 Subject: [PATCH] tests: add the suite to debci results --- .../fail-old-test-result/debci.json | 8 ++++---- .../autopkgtest/fail-to-fail/debci.json | 4 ++-- .../autopkgtest/fail-to-new/debci.json | 2 +- .../neutral-to-fail-pending-retest/debci.json | 6 +++--- .../autopkgtest/neutral-to-fail/debci.json | 4 ++-- .../autopkgtest/neutral-to-new/debci.json | 2 +- .../autopkgtest/pass-to-fail/debci.json | 4 ++-- .../autopkgtest/pass-to-neutral/debci.json | 4 ++-- .../pass-to-new-with-breaks/debci.json | 2 +- .../autopkgtest/pass-to-new/debci.json | 2 +- .../autopkgtest/pass-to-pass/debci.json | 4 ++-- tests/test_autopkgtest.py | 18 +++++++++--------- 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tests/policy-test-data/autopkgtest/fail-old-test-result/debci.json b/tests/policy-test-data/autopkgtest/fail-old-test-result/debci.json index 4815024..75ec318 100644 --- a/tests/policy-test-data/autopkgtest/fail-old-test-result/debci.json +++ b/tests/policy-test-data/autopkgtest/fail-old-test-result/debci.json @@ -1,8 +1,8 @@ {"results": [ - {"trigger": "migration-reference/0", "package": "broken", "arch": "amd64", "version": "1.0", "status": "pass", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"}, - {"trigger": "broken/2.0", "package": "broken", "arch": "amd64", "version": "2.0", "status": "pass", "run_id": "2", "updated_at": "2018-10-03T21:12:00.000Z"}, - {"trigger": "migration-reference/0", "package": "inter", "arch": "amd64", "version": "1.0", "status": "pass", "run_id": "3", "updated_at": "2018-10-03T21:12:00.000Z"}, - {"trigger": "broken/2.0", "package": "inter", "arch": "amd64", "version": "0.9", "status": "pass", "run_id": "4", "updated_at": "2018-10-03T21:12:00.000Z"} + {"trigger": "migration-reference/0", "suite": "testing", "package": "broken", "arch": "amd64", "version": "1.0", "status": "pass", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"}, + {"trigger": "broken/2.0", "suite": "testing", "package": "broken", "arch": "amd64", "version": "2.0", "status": "pass", "run_id": "2", "updated_at": "2018-10-03T21:12:00.000Z"}, + {"trigger": "migration-reference/0", "suite": "testing", "package": "inter", "arch": "amd64", "version": "1.0", "status": "pass", "run_id": "3", "updated_at": "2018-10-03T21:12:00.000Z"}, + {"trigger": "broken/2.0", "suite": "testing", "package": "inter", "arch": "amd64", "version": "0.9", "status": "pass", "run_id": "4", "updated_at": "2018-10-03T21:12:00.000Z"} ] } diff --git a/tests/policy-test-data/autopkgtest/fail-to-fail/debci.json b/tests/policy-test-data/autopkgtest/fail-to-fail/debci.json index 8ca8317..6e608ba 100644 --- a/tests/policy-test-data/autopkgtest/fail-to-fail/debci.json +++ b/tests/policy-test-data/autopkgtest/fail-to-fail/debci.json @@ -1,6 +1,6 @@ {"results": [ - {"trigger": "migration-reference/0", "package": "pkg", "arch": "amd64", "version": "2.0", "status": "fail", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"}, - {"trigger": "pkg/2.0", "package": "pkg", "arch": "amd64", "version": "2.0", "status": "fail", "run_id": "2", "updated_at": "2018-10-03T21:12:00.000Z"} + {"trigger": "migration-reference/0", "suite": "testing", "package": "pkg", "arch": "amd64", "version": "2.0", "status": "fail", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"}, + {"trigger": "pkg/2.0", "suite": "testing", "package": "pkg", "arch": "amd64", "version": "2.0", "status": "fail", "run_id": "2", "updated_at": "2018-10-03T21:12:00.000Z"} ] } diff --git a/tests/policy-test-data/autopkgtest/fail-to-new/debci.json b/tests/policy-test-data/autopkgtest/fail-to-new/debci.json index a5d820c..1efc152 100644 --- a/tests/policy-test-data/autopkgtest/fail-to-new/debci.json +++ b/tests/policy-test-data/autopkgtest/fail-to-new/debci.json @@ -1,5 +1,5 @@ {"results": [ - {"trigger": "migration-reference/0", "package": "pkg", "arch": "amd64", "version": "1.0", "status": "fail", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"} + {"trigger": "migration-reference/0", "suite": "testing", "package": "pkg", "arch": "amd64", "version": "1.0", "status": "fail", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"} ] } diff --git a/tests/policy-test-data/autopkgtest/neutral-to-fail-pending-retest/debci.json b/tests/policy-test-data/autopkgtest/neutral-to-fail-pending-retest/debci.json index 4b8b321..ce0e8e1 100644 --- a/tests/policy-test-data/autopkgtest/neutral-to-fail-pending-retest/debci.json +++ b/tests/policy-test-data/autopkgtest/neutral-to-fail-pending-retest/debci.json @@ -1,7 +1,7 @@ {"results": [ - {"trigger": "migration-reference/0", "package": "pkg", "arch": "amd64", "version": "2.0", "status": "neutral", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"}, - {"trigger": "pkg/2.0", "package": "pkg", "arch": "amd64", "version": "2.0", "status": "fail", "run_id": "2", "updated_at": "2018-10-03T21:12:00.000Z"}, - {"trigger": "pkg/2.0", "package": "pkg", "arch": "amd64", "version": "2.0", "status": null, "run_id": "3", "updated_at": "2018-10-03T21:13:00.000Z"} + {"trigger": "migration-reference/0", "suite": "testing", "package": "pkg", "arch": "amd64", "version": "2.0", "status": "neutral", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"}, + {"trigger": "pkg/2.0", "suite": "testing", "package": "pkg", "arch": "amd64", "version": "2.0", "status": "fail", "run_id": "2", "updated_at": "2018-10-03T21:12:00.000Z"}, + {"trigger": "pkg/2.0", "suite": "testing", "package": "pkg", "arch": "amd64", "version": "2.0", "status": null, "run_id": "3", "updated_at": "2018-10-03T21:13:00.000Z"} ] } diff --git a/tests/policy-test-data/autopkgtest/neutral-to-fail/debci.json b/tests/policy-test-data/autopkgtest/neutral-to-fail/debci.json index c1656d0..dd8f5fe 100644 --- a/tests/policy-test-data/autopkgtest/neutral-to-fail/debci.json +++ b/tests/policy-test-data/autopkgtest/neutral-to-fail/debci.json @@ -1,6 +1,6 @@ {"results": [ - {"trigger": "migration-reference/0", "package": "pkg", "arch": "amd64", "version": "2.0", "status": "neutral", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"}, - {"trigger": "pkg/2.0", "package": "pkg", "arch": "amd64", "version": "2.0", "status": "fail", "run_id": "2", "updated_at": "2018-10-03T21:12:00.000Z"} + {"trigger": "migration-reference/0", "suite": "testing", "package": "pkg", "arch": "amd64", "version": "2.0", "status": "neutral", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"}, + {"trigger": "pkg/2.0", "suite": "testing", "package": "pkg", "arch": "amd64", "version": "2.0", "status": "fail", "run_id": "2", "updated_at": "2018-10-03T21:12:00.000Z"} ] } diff --git a/tests/policy-test-data/autopkgtest/neutral-to-new/debci.json b/tests/policy-test-data/autopkgtest/neutral-to-new/debci.json index 47272d9..16d79f6 100644 --- a/tests/policy-test-data/autopkgtest/neutral-to-new/debci.json +++ b/tests/policy-test-data/autopkgtest/neutral-to-new/debci.json @@ -1,5 +1,5 @@ {"results": [ - {"trigger": "migration-reference/0", "package": "pkg", "arch": "amd64", "version": "2.0", "status": "neutral", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"} + {"trigger": "migration-reference/0", "suite": "testing", "package": "pkg", "arch": "amd64", "version": "2.0", "status": "neutral", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"} ] } diff --git a/tests/policy-test-data/autopkgtest/pass-to-fail/debci.json b/tests/policy-test-data/autopkgtest/pass-to-fail/debci.json index 67b562d..2c08f15 100644 --- a/tests/policy-test-data/autopkgtest/pass-to-fail/debci.json +++ b/tests/policy-test-data/autopkgtest/pass-to-fail/debci.json @@ -1,6 +1,6 @@ {"results": [ - {"trigger": "migration-reference/0", "package": "pkg", "arch": "amd64", "version": "1.0", "status": "pass", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"}, - {"trigger": "pkg/2.0", "package": "pkg", "arch": "amd64", "version": "2.0", "status": "fail", "run_id": "2", "updated_at": "2018-10-03T21:12:00.000Z"} + {"trigger": "migration-reference/0", "suite": "testing", "package": "pkg", "arch": "amd64", "version": "1.0", "status": "pass", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"}, + {"trigger": "pkg/2.0", "suite": "testing", "package": "pkg", "arch": "amd64", "version": "2.0", "status": "fail", "run_id": "2", "updated_at": "2018-10-03T21:12:00.000Z"} ] } diff --git a/tests/policy-test-data/autopkgtest/pass-to-neutral/debci.json b/tests/policy-test-data/autopkgtest/pass-to-neutral/debci.json index f9b5c92..1d913f8 100644 --- a/tests/policy-test-data/autopkgtest/pass-to-neutral/debci.json +++ b/tests/policy-test-data/autopkgtest/pass-to-neutral/debci.json @@ -1,6 +1,6 @@ {"results": [ - {"trigger": "migration-reference/0", "package": "pkg", "arch": "amd64", "version": "1.0", "status": "pass", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"}, - {"trigger": "pkg/2.0", "package": "pkg", "arch": "amd64", "version": "2.0", "status": "neutral", "run_id": "2", "updated_at": "2018-10-03T21:12:00.000Z"} + {"trigger": "migration-reference/0", "suite": "testing", "package": "pkg", "arch": "amd64", "version": "1.0", "status": "pass", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"}, + {"trigger": "pkg/2.0", "suite": "testing", "package": "pkg", "arch": "amd64", "version": "2.0", "status": "neutral", "run_id": "2", "updated_at": "2018-10-03T21:12:00.000Z"} ] } diff --git a/tests/policy-test-data/autopkgtest/pass-to-new-with-breaks/debci.json b/tests/policy-test-data/autopkgtest/pass-to-new-with-breaks/debci.json index 67fe25b..0db0e39 100644 --- a/tests/policy-test-data/autopkgtest/pass-to-new-with-breaks/debci.json +++ b/tests/policy-test-data/autopkgtest/pass-to-new-with-breaks/debci.json @@ -1,5 +1,5 @@ {"results": [ - {"trigger": "migration-reference/0", "package": "pkg", "arch": "amd64", "version": "1.0", "status": "pass", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"} + {"trigger": "migration-reference/0", "suite": "testing", "package": "pkg", "arch": "amd64", "version": "1.0", "status": "pass", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"} ] } diff --git a/tests/policy-test-data/autopkgtest/pass-to-new/debci.json b/tests/policy-test-data/autopkgtest/pass-to-new/debci.json index 67fe25b..0db0e39 100644 --- a/tests/policy-test-data/autopkgtest/pass-to-new/debci.json +++ b/tests/policy-test-data/autopkgtest/pass-to-new/debci.json @@ -1,5 +1,5 @@ {"results": [ - {"trigger": "migration-reference/0", "package": "pkg", "arch": "amd64", "version": "1.0", "status": "pass", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"} + {"trigger": "migration-reference/0", "suite": "testing", "package": "pkg", "arch": "amd64", "version": "1.0", "status": "pass", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"} ] } diff --git a/tests/policy-test-data/autopkgtest/pass-to-pass/debci.json b/tests/policy-test-data/autopkgtest/pass-to-pass/debci.json index 04f3fb7..4f60c0d 100644 --- a/tests/policy-test-data/autopkgtest/pass-to-pass/debci.json +++ b/tests/policy-test-data/autopkgtest/pass-to-pass/debci.json @@ -1,6 +1,6 @@ {"results": [ - {"trigger": "migration-reference/0", "package": "pkg", "arch": "amd64", "version": "1.0", "status": "pass", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"}, - {"trigger": "pkg/2.0", "package": "pkg", "arch": "amd64", "version": "2.0", "status": "pass", "run_id": "2", "updated_at": "2018-10-03T21:12:00.000Z"} + {"trigger": "migration-reference/0", "suite": "testing", "package": "pkg", "arch": "amd64", "version": "1.0", "status": "pass", "run_id": "1", "updated_at": "2018-10-03T21:12:00.000Z"}, + {"trigger": "pkg/2.0", "suite": "testing", "package": "pkg", "arch": "amd64", "version": "2.0", "status": "pass", "run_id": "2", "updated_at": "2018-10-03T21:12:00.000Z"} ] } diff --git a/tests/test_autopkgtest.py b/tests/test_autopkgtest.py index 05c0428..5aaf8cd 100644 --- a/tests/test_autopkgtest.py +++ b/tests/test_autopkgtest.py @@ -2445,23 +2445,23 @@ class T(TestBase): "until": 12345, "results": [ {"trigger": "green/2", "package": "darkgreen", "arch": "i386", "version": "1", "status": "pass", - "run_id": "100000", "updated_at": "2018-10-04T11:18:00.000Z"}, + "run_id": "100000", "suite": "testing", "updated_at": "2018-10-04T11:18:00.000Z"}, {"trigger": "green/2", "package": "darkgreen", "arch": "amd64", "version": "1", "status": "pass", - "run_id": "100000", "updated_at": "2018-10-04T11:18:01.000Z"}, + "run_id": "100000", "suite": "testing", "updated_at": "2018-10-04T11:18:01.000Z"}, {"trigger": "green/1", "package": "lightgreen", "arch": "i386", "version": "1", "status": "pass", - "run_id": "101000", "updated_at": "2018-10-04T11:18:02.000Z"}, + "run_id": "101000", "suite": "testing", "updated_at": "2018-10-04T11:18:02.000Z"}, {"trigger": "green/2", "package": "lightgreen", "arch": "i386", "version": "1", "status": "fail", - "run_id": "101001", "updated_at": "2018-10-04T11:18:03.000Z"}, + "run_id": "101001", "suite": "testing", "updated_at": "2018-10-04T11:18:03.000Z"}, {"trigger": "green/1", "package": "lightgreen", "arch": "amd64", "version": "1", "status": "pass", - "run_id": "101000", "updated_at": "2018-10-04T11:18:04.000Z"}, + "run_id": "101000", "suite": "testing", "updated_at": "2018-10-04T11:18:04.000Z"}, {"trigger": "green/2", "package": "lightgreen", "arch": "amd64", "version": "1", "status": "fail", - "run_id": "101001", "updated_at": "2018-10-04T11:18:05.000Z"}, + "run_id": "101001", "suite": "testing", "updated_at": "2018-10-04T11:18:05.000Z"}, {"trigger": "green/2", "package": "green", "arch": "i386", "version": "2", "status": "pass", - "run_id": "102000", "updated_at": "2018-10-04T11:18:06.000Z"}, + "run_id": "102000", "suite": "testing", "updated_at": "2018-10-04T11:18:06.000Z"}, {"trigger": "green/1", "package": "green", "arch": "amd64", "version": "2", "status": "pass", - "run_id": "102000", "updated_at": "2018-10-04T11:18:07.000Z"}, + "run_id": "102000", "suite": "testing", "updated_at": "2018-10-04T11:18:07.000Z"}, {"trigger": "green/2", "package": "green", "arch": "amd64", "version": "2", "status": "fail", - "run_id": "102001", "updated_at": "2018-10-04T11:18:08.000Z"} + "run_id": "102001", "suite": "testing", "updated_at": "2018-10-04T11:18:08.000Z"} ] } ''')