From 64d60cbccc2bc096c367767ecb733b3ebf2db46d Mon Sep 17 00:00:00 2001
From: Utz-Uwe Haus <uhaus@cray.com>
Date: Tue, 16 Feb 2021 14:32:59 +0100
Subject: [PATCH] unify reporting of events in simple_archiver
---
tests/simple_archiver.c | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/tests/simple_archiver.c b/tests/simple_archiver.c
index 1bf74c66..85c24ada 100644
--- a/tests/simple_archiver.c
+++ b/tests/simple_archiver.c
@@ -144,24 +144,43 @@ CHEAT_TEST(simple_archiver,
mstro_pool_event tmp=e;
/* handle all */
while(tmp) {
+ const char *event_name=NULL;
+ const char *cdo_name=NULL;
+ event_name = mstro_pool_event_description(tmp->kind);
+
switch(tmp->kind) {
case MSTRO_POOL_EVENT_OFFER:
/* FIXME: Immediately post a REQUIRE for it */
- fprintf(stderr, "Spotted an OFFER for CDO (`%s`)\n", e->offer.cdo_name);
+ cdo_name = tmp->offer.cdo_name;
+ break;
case MSTRO_POOL_EVENT_DECLARE:
+ cdo_name = tmp->offer.cdo_name;
+ break;
case MSTRO_POOL_EVENT_DISPOSE:
+ cdo_name = tmp->offer.cdo_name;
+ break;
case MSTRO_POOL_EVENT_SEAL:
+ cdo_name = tmp->offer.cdo_name;
+ break;
case MSTRO_POOL_EVENT_DEMAND:
+ cdo_name = tmp->offer.cdo_name;
+ break;
case MSTRO_POOL_EVENT_REQUIRE:
+ cdo_name = tmp->offer.cdo_name;
+ break;
case MSTRO_POOL_EVENT_RETRACT:
+ cdo_name = tmp->offer.cdo_name;
+ break;
case MSTRO_POOL_EVENT_WITHDRAW:
- fprintf(stdout, "CDO event %s\n",
- mstro_pool_event_description(tmp->kind));
+ cdo_name = tmp->offer.cdo_name;
break;
default:
fprintf(stderr, "Unexpected CDO event %d\n", tmp->kind);
}
+ fprintf(stdout, "CDO event %s for CDO |%s|\n",
+ event_name, cdo_name ? cdo_name : "??");
+
tmp=tmp->next;
}
/* acknowledge all */
--
GitLab