3 files changed, 11 insertions, 31 deletions

diff --git a/tests/lib/test_heavy_thread.c b/tests/lib/test_heavy_thread.c
index 075bcb6daf..b3c6e4c2f7 100644
--- a/tests/lib/test_heavy_thread.c
+++ b/tests/lib/test_heavy_thread.c
@@ -110,16 +110,9 @@ DEFUN (clear_foo,
 
 	str = argv_concat(argv, argc, 0);
 
-	if ((ws = XMALLOC(MTYPE_TMP, sizeof(*ws))) == NULL) {
-		zlog_err("%s: unable to allocate work_state", __func__);
-		return CMD_WARNING;
-	}
+	ws = XMALLOC(MTYPE_TMP, sizeof(*ws));
 
-	if (!(ws->str = XSTRDUP(MTYPE_TMP, str))) {
-		zlog_err("%s: unable to xstrdup", __func__);
-		XFREE(MTYPE_TMP, ws);
-		return CMD_WARNING;
-	}
+	ws->str = XSTRDUP(MTYPE_TMP, str);
 
 	ws->vty = vty;
 	ws->i = ITERS_FIRST;
diff --git a/tests/lib/test_heavy_wq.c b/tests/lib/test_heavy_wq.c
index 0f474dc5d2..00ddc836d7 100644
--- a/tests/lib/test_heavy_wq.c
+++ b/tests/lib/test_heavy_wq.c
@@ -60,18 +60,10 @@ static void heavy_wq_add(struct vty *vty, const char *str, int i)
 {
 	struct heavy_wq_node *hn;
 
-	if ((hn = XCALLOC(MTYPE_WQ_NODE, sizeof(struct heavy_wq_node)))
-	    == NULL) {
-		zlog_err("%s: unable to allocate hn", __func__);
-		return;
-	}
+	hn = XCALLOC(MTYPE_WQ_NODE, sizeof(struct heavy_wq_node));
 
 	hn->i = i;
-	if (!(hn->str = XSTRDUP(MTYPE_WQ_NODE_STR, str))) {
-		zlog_err("%s: unable to xstrdup", __func__);
-		XFREE(MTYPE_WQ_NODE, hn);
-		return;
-	}
+	hn->str = XSTRDUP(MTYPE_WQ_NODE_STR, str);
 
 	work_queue_add(heavy_wq, hn);
 
@@ -149,10 +141,7 @@ DEFUN (clear_foo,
 
 static int heavy_wq_init()
 {
-	if (!(heavy_wq = work_queue_new(master, "heavy_work_queue"))) {
-		zlog_err("%s: could not get new work queue!", __func__);
-		return -1;
-	}
+	heavy_wq = work_queue_new(master, "heavy_work_queue");
 
 	heavy_wq->spec.workfunc = &slow_func;
 	heavy_wq->spec.errorfunc = &slow_func_err;
diff --git a/tests/lib/test_privs.c b/tests/lib/test_privs.c
index 421c345436..e203da8f6e 100644
--- a/tests/lib/test_privs.c
+++ b/tests/lib/test_privs.c
@@ -113,10 +113,9 @@ int main(int argc, char **argv)
 	((test_privs.current_state() == ZPRIVS_RAISED) ? "Raised" : "Lowered")
 
 	printf("%s\n", PRIV_STATE());
-	test_privs.change(ZPRIVS_RAISE);
-
-	printf("%s\n", PRIV_STATE());
-	test_privs.change(ZPRIVS_LOWER);
+	frr_elevate_privs(&test_privs) {
+		printf("%s\n", PRIV_STATE());
+	}
 
 	printf("%s\n", PRIV_STATE());
 	zprivs_get_ids(&ids);
@@ -126,10 +125,9 @@ int main(int argc, char **argv)
 
 	/* but these should continue to work... */
 	printf("%s\n", PRIV_STATE());
-	test_privs.change(ZPRIVS_RAISE);
-
-	printf("%s\n", PRIV_STATE());
-	test_privs.change(ZPRIVS_LOWER);
+	frr_elevate_privs(&test_privs) {
+		printf("%s\n", PRIV_STATE());
+	}
 
 	printf("%s\n", PRIV_STATE());
 	zprivs_get_ids(&ids);