From fbd38a1597e407a4f03539229160d1762a6c66de Mon Sep 17 00:00:00 2001
From: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com>
Date: Fri, 8 Dec 2023 17:37:38 +0200
Subject: [PATCH] tests: Misc fixes to test_ingest_main

Fix IDs of sample objects in test_ingest_main(), and make sure all
notifications that should be generated are accounted for.
---
 test_kcidb.py | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/test_kcidb.py b/test_kcidb.py
index f07ce79a..510fa03a 100644
--- a/test_kcidb.py
+++ b/test_kcidb.py
@@ -467,27 +467,28 @@ def test_ingest_main():
                  status="PASS")
         ],
         issues=[
-            dict(id="test:1",
+            dict(id="test:issue:1",
                  version=1,
                  origin="test",
                  report_url="https://test.com/bug/1",
                  report_subject="Bug in kernel",
-                 culprit=dict(code=True))
+                 culprit=dict(code=True)),
         ],
         incidents=[
-            dict(id="test:1",
-                 issue_id="test:1",
+            dict(id="test:incident:1",
+                 issue_id="test:issue:1",
                  issue_version=1,
                  origin="test",
-                 test_id="test:1",
-                 present=True)
-        ]
+                 test_id="test:test:1",
+                 present=True),
+        ],
     ))
     assert_executes(one_of_everything, "kcidb.ingest_main",
                     stdout_re="Subject: Test revision: .*\x00"
                               "Subject: Test checkout: .*\x00"
                               "Subject: Test build: .*\x00"
                               "Subject: Test test: .*\x00"
+                              "Subject: Test bug: .*\x00"
                               "Subject: Test issue: .*\x00"
                               "Subject: Test incident: .*\x00")
 
@@ -526,33 +527,33 @@ def test_ingest_main():
                  status="FAIL"),
         ],
         issues=[
-            dict(id="test:1",
+            dict(id="test:issue:1",
                  version=1,
                  origin="test",
                  report_url="https://test.com/bug/1",
                  report_subject="Bug in kernel",
                  culprit=dict(code=True)),
-            dict(id="non_test:1",
+            dict(id="test:issue:2",
                  version=1,
-                 origin="non_test",
+                 origin="test",
                  report_url="https://non-test.com/bug/1",
                  report_subject="Another bug in kernel",
                  culprit=dict(tool=True))
         ],
         incidents=[
-            dict(id="test:1",
-                 issue_id="test:1",
+            dict(id="test:incident:1",
+                 issue_id="test:issue:1",
                  issue_version=1,
                  origin="test",
-                 test_id="test:1",
+                 test_id="test:test:1",
                  present=True),
-            dict(id="non_test:1",
-                 issue_id="non_test:1",
+            dict(id="test:incident:2",
+                 issue_id="test:issue:2",
                  issue_version=1,
-                 origin="non_test",
-                 test_id="non_test:1",
+                 origin="test",
+                 test_id="test:test:2",
                  present=True)
-        ]
+        ],
     ))
 
     assert_executes(two_of_everything,
@@ -563,5 +564,9 @@ def test_ingest_main():
                               "Subject: Test checkout: .*\x00"
                               "Subject: Test build: .*\x00"
                               "Subject: Test build: .*\x00"
+                              "Subject: Test bug: .*\x00"
+                              "Subject: Test bug: .*\x00"
+                              "Subject: Test issue: .*\x00"
                               "Subject: Test issue: .*\x00"
+                              "Subject: Test incident: .*\x00"
                               "Subject: Test incident: .*\x00")