Page Menu
Home
ClusterLabs Projects
Search
Configure Global Search
Log In
Files
F3687328
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
8 KB
Referenced Files
None
Subscribers
None
View Options
diff --git a/lib/common/tests/scores/pcmk_parse_score_test.c b/lib/common/tests/scores/pcmk_parse_score_test.c
index 196d16f31a..3861ef4599 100644
--- a/lib/common/tests/scores/pcmk_parse_score_test.c
+++ b/lib/common/tests/scores/pcmk_parse_score_test.c
@@ -1,119 +1,121 @@
/*
* Copyright 2024 the Pacemaker project contributors
*
* The version control history for this file may have further details.
*
* This source code is licensed under the GNU General Public License version 2
* or later (GPLv2+) WITHOUT ANY WARRANTY.
*/
#include <crm_internal.h>
#include <limits.h>
#include <crm/common/scores.h>
#include <crm/common/unittest_internal.h>
extern int pcmk__score_red;
extern int pcmk__score_green;
extern int pcmk__score_yellow;
static int default_score = 99;
static void
assert_score(const char *score_s, int expected_rc, int expected_score)
{
int score = 0;
int rc = pcmk_parse_score(score_s, &score, default_score);
assert_int_equal(rc, expected_rc);
assert_int_equal(score, expected_score);
}
static void
null_score_string(void **state)
{
assert_score(NULL, pcmk_rc_ok, default_score);
// Test out-of-bounds default score
default_score = -2000000;
assert_score(NULL, pcmk_rc_ok, -PCMK_SCORE_INFINITY);
default_score = 2000000;
assert_score(NULL, pcmk_rc_ok, PCMK_SCORE_INFINITY);
default_score = 99;
}
static void
null_score(void **state)
{
assert_int_equal(pcmk_parse_score(NULL, NULL, default_score), pcmk_rc_ok);
assert_int_equal(pcmk_parse_score("0", NULL, default_score), pcmk_rc_ok);
assert_int_equal(pcmk_parse_score("foo", NULL, default_score),
pcmk_rc_bad_input);
}
static void
bad_input(void **state)
{
assert_score("redder", pcmk_rc_bad_input, default_score);
assert_score("3.141592", pcmk_rc_ok, 3);
assert_score("0xf00d", pcmk_rc_ok, 0);
}
static void
special_values(void **state)
{
assert_score("-INFINITY", pcmk_rc_ok, -PCMK_SCORE_INFINITY);
assert_score("INFINITY", pcmk_rc_ok, PCMK_SCORE_INFINITY);
assert_score("+INFINITY", pcmk_rc_ok, PCMK_SCORE_INFINITY);
pcmk__score_red = 10;
pcmk__score_green = 20;
pcmk__score_yellow = 30;
assert_score("red", pcmk_rc_ok, pcmk__score_red);
assert_score("green", pcmk_rc_ok, pcmk__score_green);
assert_score("yellow", pcmk_rc_ok, pcmk__score_yellow);
assert_score("ReD", pcmk_rc_ok, pcmk__score_red);
assert_score("GrEeN", pcmk_rc_ok, pcmk__score_green);
assert_score("yElLoW", pcmk_rc_ok, pcmk__score_yellow);
}
/* These ridiculous macros turn an integer constant into a string constant. */
#define A(x) #x
#define B(x) A(x)
static void
outside_limits(void **state)
{
char *very_long = crm_strdup_printf(" %lld0", LLONG_MAX);
// Still within int range
assert_score(B(PCMK_SCORE_INFINITY) "00", pcmk_rc_ok, PCMK_SCORE_INFINITY);
assert_score("-" B(PCMK_SCORE_INFINITY) "00", pcmk_rc_ok,
-PCMK_SCORE_INFINITY);
// Outside long long range
assert_score(very_long, pcmk_rc_ok, PCMK_SCORE_INFINITY);
very_long[0] = '-';
assert_score(very_long, pcmk_rc_ok, -PCMK_SCORE_INFINITY);
+
+ free(very_long);
}
static void
inside_limits(void **state)
{
assert_score("1234", pcmk_rc_ok, 1234);
assert_score("-1234", pcmk_rc_ok, -1234);
}
PCMK__UNIT_TEST(NULL, NULL,
cmocka_unit_test(null_score_string),
cmocka_unit_test(null_score),
cmocka_unit_test(bad_input),
cmocka_unit_test(special_values),
cmocka_unit_test(outside_limits),
cmocka_unit_test(inside_limits))
diff --git a/lib/common/tests/xml/pcmk__xe_get_score_test.c b/lib/common/tests/xml/pcmk__xe_get_score_test.c
index e7d2a2f1fe..9fcd47fd42 100644
--- a/lib/common/tests/xml/pcmk__xe_get_score_test.c
+++ b/lib/common/tests/xml/pcmk__xe_get_score_test.c
@@ -1,149 +1,151 @@
/*
* Copyright 2024 the Pacemaker project contributors
*
* The version control history for this file may have further details.
*
* This source code is licensed under the GNU General Public License version 2
* or later (GPLv2+) WITHOUT ANY WARRANTY.
*/
#include <crm_internal.h>
#include <limits.h>
#include <crm/common/scores.h>
#include <crm/common/unittest_internal.h>
extern int pcmk__score_red;
extern int pcmk__score_green;
extern int pcmk__score_yellow;
static int default_score = 99;
static void
assert_score(const char *score_s, int expected_rc, int expected_score)
{
int score = 0;
int rc = pcmk_rc_ok;
xmlNode *xml = pcmk__xe_create(NULL, __func__);
crm_xml_add(xml, "test_attr", score_s);
rc = pcmk__xe_get_score(xml, "test_attr", &score, default_score);
assert_int_equal(rc, expected_rc);
assert_int_equal(score, expected_score);
pcmk__xml_free(xml);
}
static void
invalid_args(void **state)
{
int score = 0;
xmlNode *xml = pcmk__xe_create(NULL, __func__);
assert_int_equal(pcmk__xe_get_score(NULL, NULL, &score, default_score),
EINVAL);
assert_int_equal(pcmk__xe_get_score(xml, NULL, &score, default_score),
EINVAL);
assert_int_equal(pcmk__xe_get_score(NULL, "test", &score, default_score),
EINVAL);
pcmk__xml_free(xml);
}
static void
null_score_string(void **state)
{
assert_score(NULL, pcmk_rc_ok, default_score);
// Test out-of-bounds default score
default_score = -2000000;
assert_score(NULL, pcmk_rc_ok, -PCMK_SCORE_INFINITY);
default_score = 2000000;
assert_score(NULL, pcmk_rc_ok, PCMK_SCORE_INFINITY);
default_score = 99;
}
static void
null_score(void **state)
{
xmlNode *xml = pcmk__xe_create(NULL, __func__);
assert_int_equal(pcmk__xe_get_score(xml, "test_attr", NULL, default_score),
pcmk_rc_ok);
crm_xml_add(xml, "test_attr", "0");
assert_int_equal(pcmk__xe_get_score(xml, "test_attr", NULL, default_score),
pcmk_rc_ok);
crm_xml_add(xml, "test_attr", "foo");
assert_int_equal(pcmk__xe_get_score(xml, "test_attr", NULL, default_score),
pcmk_rc_bad_input);
pcmk__xml_free(xml);
}
static void
bad_input(void **state)
{
assert_score("redder", pcmk_rc_bad_input, default_score);
assert_score("3.141592", pcmk_rc_ok, 3);
assert_score("0xf00d", pcmk_rc_ok, 0);
}
static void
special_values(void **state)
{
assert_score("-INFINITY", pcmk_rc_ok, -PCMK_SCORE_INFINITY);
assert_score("INFINITY", pcmk_rc_ok, PCMK_SCORE_INFINITY);
assert_score("+INFINITY", pcmk_rc_ok, PCMK_SCORE_INFINITY);
pcmk__score_red = 10;
pcmk__score_green = 20;
pcmk__score_yellow = 30;
assert_score("red", pcmk_rc_ok, pcmk__score_red);
assert_score("green", pcmk_rc_ok, pcmk__score_green);
assert_score("yellow", pcmk_rc_ok, pcmk__score_yellow);
assert_score("ReD", pcmk_rc_ok, pcmk__score_red);
assert_score("GrEeN", pcmk_rc_ok, pcmk__score_green);
assert_score("yElLoW", pcmk_rc_ok, pcmk__score_yellow);
}
/* These ridiculous macros turn an integer constant into a string constant. */
#define A(x) #x
#define B(x) A(x)
static void
outside_limits(void **state)
{
char *very_long = crm_strdup_printf(" %lld0", LLONG_MAX);
// Still within int range
assert_score(B(PCMK_SCORE_INFINITY) "00", pcmk_rc_ok, PCMK_SCORE_INFINITY);
assert_score("-" B(PCMK_SCORE_INFINITY) "00", pcmk_rc_ok,
-PCMK_SCORE_INFINITY);
// Outside long long range
assert_score(very_long, pcmk_rc_ok, PCMK_SCORE_INFINITY);
very_long[0] = '-';
assert_score(very_long, pcmk_rc_ok, -PCMK_SCORE_INFINITY);
+
+ free(very_long);
}
static void
inside_limits(void **state)
{
assert_score("1234", pcmk_rc_ok, 1234);
assert_score("-1234", pcmk_rc_ok, -1234);
}
PCMK__UNIT_TEST(NULL, NULL,
cmocka_unit_test(invalid_args),
cmocka_unit_test(null_score_string),
cmocka_unit_test(null_score),
cmocka_unit_test(bad_input),
cmocka_unit_test(special_values),
cmocka_unit_test(outside_limits),
cmocka_unit_test(inside_limits))
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Mon, Apr 21, 7:13 PM (5 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1665447
Default Alt Text
(8 KB)
Attached To
Mode
rP Pacemaker
Attached
Detach File
Event Timeline
Log In to Comment