RHINENG-19880: update tests for system delete event

systems are marked as stale and culled instead of being removed from database

Author: MichaelMraka

listener/common_test.go

@@ -63,9 +63,11 @@ func assertSystemInDB(t *testing.T, inventoryID string, rhAccountID *int, report
 	assert.True(t, system.LastUpload.After(now), "Last upload")
 }
 
-func assertSystemNotInDB(t *testing.T) {
+func assertSystemStaleAndCulled(t *testing.T) {
 	var systemCount int64
+	now := time.Now()
 	assert.Nil(t, database.DB.Model(models.SystemPlatform{}).
+		Where("stale = true AND stale_timestamp < ? AND culled_timestamp < ?", now, now).
 		Where("inventory_id = ?::uuid", id).Count(&systemCount).Error)
 
 	assert.Equal(t, int(systemCount), 0)

listener/events_test.go

@@ -49,7 +49,7 @@ func TestDeleteSystem(t *testing.T) {
 
 	deleteEvent := createTestDeleteEvent(id)
 	err := HandleDelete(deleteEvent)
-	assertSystemNotInDB(t)
+	assertSystemStaleAndCulled(t)
 	assert.NoError(t, err)
 }
 
@@ -107,7 +107,7 @@ func TestUploadAfterDelete(t *testing.T) {
 	uploadEvent := createTestUploadEvent("1", id, "puptoo", true, false)
 	err := HandleUpload(uploadEvent)
 	assert.NoError(t, err)
-	assertSystemNotInDB(t)
+	assertSystemStaleAndCulled(t)
 }
 
 func TestDeleteCleanup(t *testing.T) {