Skip to content

Backport: Remove test data with too long log configs, const specifier fix and bluechi-is-enabled test fix #1111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
engelmi merged 3 commits into from
Dec 11, 2025
Merged

Backport: Remove test data with too long log configs, const specifier fix and bluechi-is-enabled test fix #1111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b725de6
Remove test data with too long log configs
engelmi Dec 3, 2025
e73422d
Update is-enabled integration test
engelmi Jul 4, 2025
1117849
Added const specifier to variable initialization in parse_selinux_type
engelmi Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libbluechi/common/parse-util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ char *parse_selinux_type(const char *context) {
/* Format is user:role:type:level */

/* Skip user */
char *s = strchr(context, ':');
const char *s = strchr(context, ':');
if (s == NULL) {
return NULL;
}
Expand All @@ -85,7 +85,7 @@ char *parse_selinux_type(const char *context) {
return NULL;
}

char *end = strchr(s, ':');
const char *end = strchr(s, ':');
if (end == NULL) {
return NULL;
}
Expand Down
2 changes: 1 addition & 1 deletion src/proxy/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ int parse_node_unit_opt(const char *opt_node_unit, char **ret_node_name, char **
return -EINVAL;
}

char *split = strchr(opt_node_unit, '_');
const char *split = strchr(opt_node_unit, '_');
if (split == NULL || split == opt_node_unit) {
fprintf(stderr, "No underscore in unit name '%s'\n", opt_node_unit);
return -EINVAL;
Expand Down
4 changes: 0 additions & 4 deletions tests/bluechi_test/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@

class BluechiConfig:

# use a smaller max line length than possible
# to prevent any accidental faults
MAX_LINE_LENGTH = 400

def __init__(self, file_name: str) -> None:
self.file_name = file_name

Expand Down
10 changes: 0 additions & 10 deletions tests/tests/tier0/bluechi-agent-logisquiet/test_agent_logisquiet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
from bluechi_test.test import BluechiTest

NODE_GOOD = "node-good"
NODE_WITH_LONG_LOGISQUIET = "node-long-logisquiet"
NODE_WITH_NOT_VALID_VALUE = "node-with-not-valid-value"
NODE_WITH_NUMBERS_ONLY_IN_LOGISQUIET = "node-numbers-only"

Expand All @@ -21,9 +20,6 @@ def start_with_invalid_logisquiet(
node_good = nodes[NODE_GOOD]
assert node_good.wait_for_unit_state_to_be("bluechi-agent", "active")

node_with_log_logisquiet = nodes[NODE_WITH_LONG_LOGISQUIET]
assert node_with_log_logisquiet.wait_for_unit_state_to_be("bluechi-agent", "failed")

node_with_not_valid_value = nodes[NODE_WITH_NOT_VALID_VALUE]
assert node_with_not_valid_value.wait_for_unit_state_to_be(
"bluechi-agent", "active"
Expand All @@ -45,10 +41,6 @@ def test_agent_invalid_configuration(
node_good_cfg.node_name = NODE_GOOD
node_good_cfg.log_is_quiet = "false"

node_with_long_logisquiet_cfg = bluechi_node_default_config.deep_copy()
node_with_long_logisquiet_cfg.node_name = NODE_WITH_LONG_LOGISQUIET
node_with_long_logisquiet_cfg.log_is_quiet = "NO_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION" # noqa: E501, E261

node_with_invalid_value_cfg = bluechi_node_default_config.deep_copy()
node_with_invalid_value_cfg.node_name = NODE_WITH_NOT_VALID_VALUE
node_with_invalid_value_cfg.log_is_quiet = "NOT_TRUE_OR_FALSE_VALUE"
Expand All @@ -61,15 +53,13 @@ def test_agent_invalid_configuration(

bluechi_ctrl_default_config.allowed_node_names = [
NODE_GOOD,
NODE_WITH_LONG_LOGISQUIET,
NODE_WITH_NOT_VALID_VALUE,
NODE_WITH_NUMBERS_ONLY_IN_LOGISQUIET,
]

bluechi_test.set_bluechi_controller_config(bluechi_ctrl_default_config)

bluechi_test.add_bluechi_agent_config(node_good_cfg)
bluechi_test.add_bluechi_agent_config(node_with_long_logisquiet_cfg)
bluechi_test.add_bluechi_agent_config(node_with_invalid_value_cfg)
bluechi_test.add_bluechi_agent_config(node_with_numbersonly_in_logisquiet_cfg)

Expand Down
10 changes: 0 additions & 10 deletions tests/tests/tier0/bluechi-agent-loglevel/test_agent_loglevel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
from bluechi_test.test import BluechiTest

NODE_GOOD = "node-good"
NODE_WITH_LONG_LOGLEVEL = "node-long-loglevel"
NODE_WITH_NOT_VALID_VALUE = "node-with-not-valid-value"
NODE_WITH_NUMBERS_ONLY_IN_LOGLEVEL = "node-numbers-only"

Expand All @@ -22,9 +21,6 @@ def start_with_invalid_loglevel(
node_good = nodes[NODE_GOOD]
assert node_good.wait_for_unit_state_to_be("bluechi-agent", "active")

node_with_log_loglevel = nodes[NODE_WITH_LONG_LOGLEVEL]
assert node_with_log_loglevel.wait_for_unit_state_to_be("bluechi-agent", "failed")

node_with_not_valid_value = nodes[NODE_WITH_NOT_VALID_VALUE]
assert node_with_not_valid_value.wait_for_unit_state_to_be(
"bluechi-agent", "active"
Expand All @@ -46,10 +42,6 @@ def test_agent_invalid_configuration(
node_good_cfg.node_name = NODE_GOOD
node_good_cfg.log_level = "INFO"

node_with_long_loglevel_cfg = bluechi_node_default_config.deep_copy()
node_with_long_loglevel_cfg.node_name = NODE_WITH_LONG_LOGLEVEL
node_with_long_loglevel_cfg.log_level = "NO_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION" # noqa: E501, E261

node_with_invalid_value_cfg = bluechi_node_default_config.deep_copy()
node_with_invalid_value_cfg.node_name = NODE_WITH_NOT_VALID_VALUE
node_with_invalid_value_cfg.log_level = "NOT_INFO_OR_DEBUG_OR_WARN_OR_ERROR_VALUE"
Expand All @@ -60,15 +52,13 @@ def test_agent_invalid_configuration(

bluechi_ctrl_default_config.allowed_node_names = [
NODE_GOOD,
NODE_WITH_LONG_LOGLEVEL,
NODE_WITH_NOT_VALID_VALUE,
NODE_WITH_NUMBERS_ONLY_IN_LOGLEVEL,
]

bluechi_test.set_bluechi_controller_config(bluechi_ctrl_default_config)

bluechi_test.add_bluechi_agent_config(node_good_cfg)
bluechi_test.add_bluechi_agent_config(node_with_long_loglevel_cfg)
bluechi_test.add_bluechi_agent_config(node_with_invalid_value_cfg)
bluechi_test.add_bluechi_agent_config(node_with_numbersonly_in_loglevel_cfg)

Expand Down
10 changes: 0 additions & 10 deletions tests/tests/tier0/bluechi-agent-logtarget/test_agent_logtarget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
from bluechi_test.test import BluechiTest

NODE_GOOD = "node-good"
NODE_WITH_LONG_LOGTARGET = "node-long-logtarget"
NODE_WITH_NOT_VALID_VALUE = "node-with-not-valid-value"
NODE_WITH_NUMBERS_ONLY_IN_LOGTARGET = "node-numbers-only"

Expand All @@ -21,9 +20,6 @@ def start_with_invalid_logtarget(
node_good = nodes[NODE_GOOD]
assert node_good.wait_for_unit_state_to_be("bluechi-agent", "active")

node_with_long_logtarget = nodes[NODE_WITH_LONG_LOGTARGET]
assert node_with_long_logtarget.wait_for_unit_state_to_be("bluechi-agent", "failed")

node_with_numbers_only_in_logtarget = nodes[NODE_WITH_NUMBERS_ONLY_IN_LOGTARGET]
assert node_with_numbers_only_in_logtarget.wait_for_unit_state_to_be(
"bluechi-agent", "active"
Expand All @@ -45,10 +41,6 @@ def test_agent_invalid_logtarget_configuration(
node_good_cfg.node_name = NODE_GOOD
node_good_cfg.log_target = "stderr"

node_with_long_logtarget_cfg = bluechi_node_default_config.deep_copy()
node_with_long_logtarget_cfg.node_name = NODE_WITH_LONG_LOGTARGET
node_with_long_logtarget_cfg.log_target = "NO_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION_NOT_REALLY_A_VALID_OPTION" # noqa: E501, E261

node_with_invalid_value_cfg = bluechi_node_default_config.deep_copy()
node_with_invalid_value_cfg.node_name = NODE_WITH_NOT_VALID_VALUE
node_with_invalid_value_cfg.log_target = "NOT_STDERR_OR_JOURNALD_VALUE"
Expand All @@ -61,15 +53,13 @@ def test_agent_invalid_logtarget_configuration(

bluechi_ctrl_default_config.allowed_node_names = [
NODE_GOOD,
NODE_WITH_LONG_LOGTARGET,
NODE_WITH_NOT_VALID_VALUE,
NODE_WITH_NUMBERS_ONLY_IN_LOGTARGET,
]

bluechi_test.set_bluechi_controller_config(bluechi_ctrl_default_config)

bluechi_test.add_bluechi_agent_config(node_good_cfg)
bluechi_test.add_bluechi_agent_config(node_with_long_logtarget_cfg)
bluechi_test.add_bluechi_agent_config(node_with_invalid_value_cfg)
bluechi_test.add_bluechi_agent_config(node_with_numbersonly_in_logtarget_cfg)

Expand Down
16 changes: 14 additions & 2 deletions tests/tests/tier0/bluechictl-is-enabled/test_bluechictl_is_enabled.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,22 @@ def check_execs(
ctrl: BluechiControllerMachine,
node: BluechiAgentMachine,
unit_name: str,
unit_exists: bool = True,
check_output: bool = True,
):
bc_res, bc_out = ctrl.bluechictl.is_enabled(
node_name=node_foo_name, unit_name=unit_name
)
sc_res, sc_out = node.systemctl.is_enabled(unit_name=unit_name)

assert bc_res == sc_res
# For non-existent units systemctl returns 4 since 253 (see https://lwn.net/Articles/923545/)
# bluechictl returns the error code of the sd_bus_call_method call, so the ret codes differ
if unit_exists:
assert bc_res == sc_res
else:
assert bc_res == 1
assert sc_res == 4

if check_output:
assert bc_out == sc_out

Expand All @@ -53,7 +61,11 @@ def exec(ctrl: BluechiControllerMachine, nodes: Dict[str, BluechiAgentMachine]):

# Error message from bluechictl is not completely the same as from systemctl for non-existent service
check_execs(
ctrl=ctrl, node=node_foo, unit_name="non-existent.service", check_output=False
ctrl=ctrl,
node=node_foo,
unit_name="non-existent.service",
unit_exists=False,
check_output=False,
)


Expand Down