Skip to content

Commit 86bc2ef

Browse files
committed
kvs/test: bail out on failed cache_create()
Problem: In kvsroot and kvs_wait_version tests we should bail out if a call to cache_create() fails. This is missed in some cases. Call BAIL_OUT if cache_create() fails.
1 parent 27f4390 commit 86bc2ef

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

src/modules/kvs/test/kvs_wait_version.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ void basic_api_tests (void)
5353
struct kvsroot *root;
5454
flux_msg_t *msg;
5555

56-
cache = cache_create (NULL);
56+
if (!(cache = cache_create (NULL)))
57+
BAIL_OUT ("cache_create");
5758

5859
ok ((krm = kvsroot_mgr_create (NULL, NULL)) != NULL,
5960
"kvsroot_mgr_create works");
@@ -190,7 +191,8 @@ void basic_remove_tests (void)
190191
struct kvsroot *root;
191192
int i;
192193

193-
cache = cache_create (NULL);
194+
if (!(cache = cache_create (NULL)))
195+
BAIL_OUT ("cache_create");
194196

195197
ok ((krm = kvsroot_mgr_create (NULL, NULL)) != NULL,
196198
"kvsroot_mgr_create works");

src/modules/kvs/test/kvsroot.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ void basic_api_tests (void)
3232
struct flux_msg_cred cred;
3333
flux_msg_t *request;
3434

35-
cache = cache_create (NULL);
35+
if (!(cache = cache_create (NULL)))
36+
BAIL_OUT ("cache_create");
3637

3738
ok ((krm = kvsroot_mgr_create (NULL, &global)) != NULL,
3839
"kvsroot_mgr_create works");
@@ -170,7 +171,8 @@ void basic_api_tests_non_primary (void)
170171
struct cache *cache;
171172
struct kvsroot *root;
172173

173-
cache = cache_create (NULL);
174+
if (!(cache = cache_create (NULL)))
175+
BAIL_OUT ("cache_create");
174176

175177
ok ((krm = kvsroot_mgr_create (NULL, &global)) != NULL,
176178
"kvsroot_mgr_create works");
@@ -225,7 +227,8 @@ void basic_iter_tests (void)
225227
struct kvsroot *root;
226228
int count;
227229

228-
cache = cache_create (NULL);
230+
if (!(cache = cache_create (NULL)))
231+
BAIL_OUT ("cache_create");
229232

230233
ok ((krm = kvsroot_mgr_create (NULL, &global)) != NULL,
231234
"kvsroot_mgr_create works");
@@ -285,7 +288,8 @@ void basic_kvstxn_mgr_tests (void)
285288
json_t *ops = NULL;
286289
void *tmpaux;
287290

288-
cache = cache_create (NULL);
291+
if (!(cache = cache_create (NULL)))
292+
BAIL_OUT ("cache_create");
289293

290294
ok ((krm = kvsroot_mgr_create (NULL, &global)) != NULL,
291295
"kvsroot_mgr_create works");

0 commit comments

Comments
 (0)