SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: use _cleanup_ for UnitFileList hash

Browse Source
This commit is contained in:
David Tardon
2023-04-12 17:09:41 +02:00
parent 6ff02eac41
commit 1abcc826ca
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-install-root.c
+2 -4
View File
@@ -578,7 +578,7 @@ TEST(preset_and_list) {
UnitFileState state;
bool got_yes = false, got_no = false;
UnitFileList *fl;
Hashmap *h;
_cleanup_(hashmap_freep) Hashmap *h = NULL;
assert_se(unit_file_get_state(RUNTIME_SCOPE_SYSTEM, root, "preset-yes.service", &state) == -ENOENT);
assert_se(unit_file_get_state(RUNTIME_SCOPE_SYSTEM, root, "preset-no.service", &state) == -ENOENT);
@@ -653,7 +653,7 @@ TEST(preset_and_list) {
assert_se(unit_file_get_state(RUNTIME_SCOPE_SYSTEM, root, "preset-yes.service", &state) >= 0 && state == UNIT_FILE_ENABLED);
assert_se(unit_file_get_state(RUNTIME_SCOPE_SYSTEM, root, "preset-no.service", &state) >= 0 && state == UNIT_FILE_DISABLED);
assert_se(h = hashmap_new(&string_hash_ops));
assert_se(h = hashmap_new(&unit_file_list_hash_ops_free));
assert_se(unit_file_get_list(RUNTIME_SCOPE_SYSTEM, root, h, NULL, NULL) >= 0);
p = strjoina(root, "/usr/lib/systemd/system/preset-yes.service");
@@ -673,8 +673,6 @@ TEST(preset_and_list) {
assert_se(IN_SET(fl->state, UNIT_FILE_DISABLED, UNIT_FILE_STATIC, UNIT_FILE_INDIRECT, UNIT_FILE_ALIAS));
}
unit_file_list_free(h);
assert_se(got_yes && got_no);
}
src/test/test-install.c
+2 -4
View File
@@ -20,7 +20,7 @@ static void dump_changes(InstallChange *c, unsigned n) {
}
int main(int argc, char* argv[]) {
Hashmap *h;
_cleanup_(hashmap_freep) Hashmap *h = NULL;
UnitFileList *p;
int r;
const char *const files[] = { "avahi-daemon.service", NULL };
@@ -31,7 +31,7 @@ int main(int argc, char* argv[]) {
test_setup_logging(LOG_DEBUG);
h = hashmap_new(&string_hash_ops);
h = hashmap_new(&unit_file_list_hash_ops_free);
r = unit_file_get_list(RUNTIME_SCOPE_SYSTEM, NULL, h, NULL, NULL);
assert_se(r == 0);
@@ -48,8 +48,6 @@ int main(int argc, char* argv[]) {
unit_file_state_to_string(p->state));
}
unit_file_list_free(h);
log_info("/*** enable **/");
r = unit_file_enable(RUNTIME_SCOPE_SYSTEM, 0, NULL, (char**) files, &changes, &n_changes);
src/test/test-load-fragment.c
+2 -4
View File
@@ -41,10 +41,10 @@ STATIC_DESTRUCTOR_REGISTER(runtime_dir, rm_rf_physical_and_freep);
TEST_RET(unit_file_get_set) {
int r;
Hashmap *h;
_cleanup_(hashmap_freep) Hashmap *h = NULL;
UnitFileList *p;
h = hashmap_new(&string_hash_ops);
h = hashmap_new(&unit_file_list_hash_ops_free);
assert_se(h);
r = unit_file_get_list(RUNTIME_SCOPE_SYSTEM, NULL, h, NULL, NULL);
@@ -59,8 +59,6 @@ TEST_RET(unit_file_get_set) {
HASHMAP_FOREACH(p, h)
printf("%s = %s\n", p->path, unit_file_state_to_string(p->state));
unit_file_list_free(h);
return 0;
}