drivers/dstate.c, tests/driver_methods_utest.c: check that LB can be set and status set+commit+set+commit (without init in the middle) adds reported tokens [networkupstools#2934]

Signed-off-by: Jim Klimov <[email protected]>

Author: jimklimov

drivers/dstate.c

@@ -1768,9 +1768,8 @@ int dstate_is_stale(void)
 /* clean out the temp space for a new pass */
 void status_init(void)
 {
-	if (dstate_getinfo("driver.flag.ignorelb")) {
-		ignorelb = 1;
-	}
+	/* This does not normally change in driver run-time, but can in tests */
+	ignorelb = (dstate_getinfo("driver.flag.ignorelb") ? 1 : 0);
 
 	memset(status_buf, 0, sizeof(status_buf));
 	alarm_status = 0;

tests/driver_methods_utest.c

@@ -85,10 +85,11 @@ int main(int argc, char **argv) {
 	status_set("OL BOOST");
 	status_set("OB ");
 	status_set(" BOOST");
+	status_set(" LB");	/* Initial ignorelb==0 so this should get set */
 	status_commit();
 
 	valueStr = dstate_getinfo("ups.status");
-	report_0_means_pass(strcmp(valueStr, "OL BOOST OB"));
+	report_0_means_pass(strcmp(valueStr, "OL BOOST OB LB"));
 	printf(" test for ups.status: '%s'; got no duplicates?\n", NUT_STRARG(valueStr));
 
 	/* Test case #2 (built on top of #1)
@@ -104,7 +105,7 @@ int main(int argc, char **argv) {
 	status_commit(); /* to register ALARM status */
 
 	valueStr = dstate_getinfo("ups.status");
-	report_0_means_pass(strcmp(valueStr, "ALARM OL BOOST OB"));
+	report_0_means_pass(strcmp(valueStr, "ALARM OL BOOST OB LB"));
 	printf(" test for ups.status: '%s'; got alarm, no duplicates?\n", NUT_STRARG(valueStr));
 
 	/* Test case #3 (built on top of #2)
@@ -255,7 +256,7 @@ int main(int argc, char **argv) {
 	status_init();
 	status_set("OL BOOST");
 	status_set("OB");
-	status_set("LB");	/* Should be honoured */
+	status_set("LB");	/* ignorelb should be honoured */
 	status_commit();
 
 	valueStr = dstate_getinfo("ups.status");
@@ -327,6 +328,45 @@ int main(int argc, char **argv) {
 	report_0_means_pass(strcmp(valueStr, "\0"));
 	printf(" test for ups.status with alarm_ set, status_commit() before alarm_commit(): '%s'; got empty, no whitespace?\n", NUT_STRARG(valueStr));
 
+	/* Test cases #17+#18+#19+#20 (from scratch, checking data step by step)
+	 * Set and commit a status, then add and commit some more (without
+	 * a re-init). The resulting ups.status should contain all set tokens.
+	 */
+	/* NOTE: This is a flag, either present with any value (true) or absent */
+	dstate_delinfo("driver.flag.ignorelb");
+
+	alarm_init();
+	alarm_commit();
+	status_init();
+	status_set("OB");
+	status_set("LB");	/* LB should be honoured when we do not ignorelb */
+
+	/* #17 */
+	valueStr = dstate_getinfo("ups.status");
+	report_0_means_pass(strcmp(valueStr, "\0"));
+	printf(" test for ups.status empty after status_set() and before status_commit(): '%s'; got alarm, no duplicates?\n", NUT_STRARG(valueStr));
+
+	status_commit();
+
+	/* #18 */
+	valueStr = dstate_getinfo("ups.status");
+	report_0_means_pass(strcmp(valueStr, "OB LB"));
+	printf(" test for ups.status with just OB and LB set via status_set() and committed: '%s'; got alarm, no duplicates?\n", NUT_STRARG(valueStr));
+
+	status_set("FSD");
+
+	/* #19 */
+	valueStr = dstate_getinfo("ups.status");
+	report_0_means_pass(strcmp(valueStr, "OB LB"));
+	printf(" test for ups.status with next token set via status_set() but not yet committed: '%s'; got alarm, no duplicates?\n", NUT_STRARG(valueStr));
+
+	status_commit();
+
+	/* #20 */
+	valueStr = dstate_getinfo("ups.status");
+	report_0_means_pass(strcmp(valueStr, "OB LB FSD"));
+	printf(" test for ups.status with FSD token set and now committed: '%s'; got alarm, no duplicates?\n", NUT_STRARG(valueStr));
+
 	/* Clear testing state before finishing. */
 	alarm_init();
 	alarm_commit();