match tests

Author: chu11

src/modules/job-list/Makefile.am

@@ -34,7 +34,8 @@ libjob_list_la_SOURCES = \
 	match.c
 
 TESTS = \
-	test_job_data.t
+	test_job_data.t \
+	test_match.t
 
 test_ldadd = \
 	$(builddir)/libjob-list.la \
@@ -67,6 +68,14 @@ test_job_data_t_LDADD = \
 test_job_data_t_LDFLAGS = \
 	$(test_ldflags)
 
+test_match_t_SOURCES = test/match.c
+test_match_t_CPPFLAGS = \
+	$(test_cppflags)
+test_match_t_LDADD = \
+	$(test_ldadd)
+test_match_t_LDFLAGS = \
+	$(test_ldflags)
+
 EXTRA_DIST = \
 	test/R/1node_1core.R \
 	test/R/1node_4core.R \

src/modules/job-list/match.c

@@ -48,11 +48,6 @@ static struct list_constraint *list_constraint_new (flux_error_t *errp)
     return c;
 }
 
-bool list_constraint_match (struct list_constraint *c, const struct job *job)
-{
-    return c->match (c, job);
-}
-
 static void list_constraint_destructor (void **item)
 {
     if (item) {
@@ -186,32 +181,42 @@ static struct list_constraint *create_string_constraint (const char *op,
                                                          flux_error_t *errp)
 {
     struct list_constraint *c;
-    json_t *v = json_array_get (values, 0);
-    char *s = NULL;
-    if (!v || !json_is_string (v)) {
-        errprintf (errp, "%s value must be a string", op);
-        return NULL;
-    }
-    if (!(s = strdup (json_string_value (v))))
-        return NULL;
-    if (!(c = list_constraint_new (errp))
-        || !zlistx_add_end (c->values, s)) {
-        list_constraint_destroy (c);
-        free (s);
+    json_t *entry;
+    size_t index;
+
+    if (!(c = list_constraint_new (errp)))
         return NULL;
+    json_array_foreach (values, index, entry) {
+        char *s = NULL;
+        if (!json_is_string (entry)) {
+            errprintf (errp, "%s value must be a string", op);
+            goto error;
+        }
+        if (!(s = strdup (json_string_value (entry))))
+            return NULL;
+        if (!zlistx_add_end (c->values, s)) {
+            free (s);
+            goto error;
+        }
     }
     zlistx_set_destructor (c->values, wrap_free);
     c->match = match_cb;
     return c;
+error:
+    list_constraint_destroy (c);
+    return NULL;
 }
 
 static bool match_name (struct list_constraint *c,
                         const struct job *job)
 {
     const char *name = zlistx_first (c->values);
-    if (!job->name)
-        return false;
-    return streq (name, job->name);
+    while (name) {
+        if (job->name && streq (name, job->name))
+            return true;
+        name = zlistx_next (c->values);
+    }
+    return false;
 }
 
 static struct list_constraint *create_name_constraint (json_t *values,
@@ -224,9 +229,12 @@ static bool match_queue (struct list_constraint *c,
                          const struct job *job)
 {
     const char *queue = zlistx_first (c->values);
-    if (!job->queue)
-        return false;
-    return streq (queue, job->queue);
+    while (queue) {
+        if (job->queue && streq (queue, job->queue))
+            return true;
+        queue = zlistx_next (c->values);
+    }
+    return false;
 }
 
 static struct list_constraint *create_queue_constraint (json_t *values,
@@ -274,7 +282,8 @@ static int array_to_states_bitmask (json_t *values,
     int states = 0;
     json_t *entry;
     size_t index;
-    int valid_states = (FLUX_JOB_STATE_PENDING
+    int valid_states = (FLUX_JOB_STATE_NEW
+                        | FLUX_JOB_STATE_PENDING
                         | FLUX_JOB_STATE_RUNNING
                         | FLUX_JOB_STATE_INACTIVE);