Skip to content

adaptived: ftests: Delete temporary conf files #53

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
drakenclimber merged 1 commit into from
Aug 14, 2025
Merged

adaptived: ftests: Delete temporary conf files #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions adaptived/tests/ftests/1000-sudo-effect-sd_bus_setting_set_int.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@

static const char * const cgroup_slice_name = "sudo1000.slice";
static const int expected_value = 89997312; /* Must be multiple of 4K */
static const char * const old_conf_file = "/etc/systemd/system.control/sudo1000.slice.d/50-MemoryMax.conf";
static const char * const old_unit_file_dir = "/etc/systemd/system.control/sudo1000.slice.d";

int main(int argc, char *argv[])
{
Expand All @@ -48,6 +50,13 @@ int main(int argc, char *argv[])
struct adaptived_ctx *ctx = NULL;
int ret, version;

/*
* systemd will read from old conf files rather than the cgroup sysfs. Therefore
* delete them
*/
delete_file(old_conf_file);
delete_dir(old_unit_file_dir);

snprintf(config_path, FILENAME_MAX - 1, "%s/1000-sudo-effect-sd_bus_setting_set_int.json", argv[1]);
config_path[FILENAME_MAX - 1] = '\0';

Expand Down
9 changes: 9 additions & 0 deletions adaptived/tests/ftests/1001-sudo-effect-sd_bus_setting_add_int.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@

static const char * const cgroup_slice_name = "sudo1001.slice";
static const int expected_value = 90001408; /* Must be multiple of 4K */
static const char * const old_conf_file = "/etc/systemd/system.control/sudo1001.slice.d/50-MemoryMax.conf";
static const char * const old_unit_file_dir = "/etc/systemd/system.control/sudo1001.slice.d";

int main(int argc, char *argv[])
{
Expand All @@ -48,6 +50,13 @@ int main(int argc, char *argv[])
struct adaptived_ctx *ctx = NULL;
int ret, version;

/*
* systemd will read from old conf files rather than the cgroup sysfs. Therefore
* delete them
*/
delete_file(old_conf_file);
delete_dir(old_unit_file_dir);

snprintf(config_path, FILENAME_MAX - 1, "%s/1001-sudo-effect-sd_bus_setting_add_int.json", argv[1]);
config_path[FILENAME_MAX - 1] = '\0';

Expand Down
9 changes: 9 additions & 0 deletions adaptived/tests/ftests/1002-sudo-effect-sd_bus_setting_sub_int.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@

static const char * const cgroup_slice_name = "sudo1002.slice";
static const int expected_value = 89993216; /* Must be multiple of 4K */
static const char * const old_conf_file = "/etc/systemd/system.control/sudo1002.slice.d/50-MemoryMax.conf";
static const char * const old_unit_file_dir = "/etc/systemd/system.control/sudo1002.slice.d";

int main(int argc, char *argv[])
{
Expand All @@ -48,6 +50,13 @@ int main(int argc, char *argv[])
struct adaptived_ctx *ctx = NULL;
int ret, version;

/*
* systemd will read from old conf files rather than the cgroup sysfs. Therefore
* delete them
*/
delete_file(old_conf_file);
delete_dir(old_unit_file_dir);

snprintf(config_path, FILENAME_MAX - 1, "%s/1002-sudo-effect-sd_bus_setting_sub_int.json", argv[1]);
config_path[FILENAME_MAX - 1] = '\0';

Expand Down
11 changes: 11 additions & 0 deletions adaptived/tests/ftests/1003-sudo-effect-sd_bus_setting-CPUQuota.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@
static const char * const cgroup_slice_name = "sudo1003.slice";
static const int expected_quota = 440000;
static const int expected_period = 1000000;
static const char * const old_conf_file1 = "/etc/systemd/system.control/sudo1003.slice.d/50-CPUQuota.conf";
static const char * const old_conf_file2 = "/etc/systemd/system.control/sudo1003.slice.d/50-CPUQuotaPeriodSec.conf";
static const char * const old_unit_file_dir = "/etc/systemd/system.control/sudo1003.slice.d";

int main(int argc, char *argv[])
{
Expand All @@ -55,6 +58,14 @@ int main(int argc, char *argv[])
size_t len = 0;
ssize_t read;

/*
* systemd will read from old conf files rather than the cgroup sysfs. Therefore
* delete them
*/
delete_file(old_conf_file1);
delete_file(old_conf_file2);
delete_dir(old_unit_file_dir);

snprintf(config_path, FILENAME_MAX - 1, "%s/1003-sudo-effect-sd_bus_setting-CPUQuota.json", argv[1]);
config_path[FILENAME_MAX - 1] = '\0';

Expand Down
9 changes: 9 additions & 0 deletions adaptived/tests/ftests/1004-sudo-effect-sd_bus_setting_add_int_infinity.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
static const char * const cgroup_slice_name = "sudo1004.slice";
static const long long expected_value_v1 = 9223372036854771712;
static const char * expected_value_v2 = "max\n";
static const char * const old_conf_file = "/etc/systemd/system.control/sudo1004.slice.d/50-MemoryMax.conf";
static const char * const old_unit_file_dir = "/etc/systemd/system.control/sudo1004.slice.d";

int main(int argc, char *argv[])
{
Expand All @@ -49,6 +51,13 @@ int main(int argc, char *argv[])
struct adaptived_ctx *ctx = NULL;
int ret, version;

/*
* systemd will read from old conf files rather than the cgroup sysfs. Therefore
* delete them
*/
delete_file(old_conf_file);
delete_dir(old_unit_file_dir);

snprintf(config_path, FILENAME_MAX - 1, "%s/1004-sudo-effect-sd_bus_setting_add_int_infinity.json", argv[1]);
config_path[FILENAME_MAX - 1] = '\0';

Expand Down
9 changes: 9 additions & 0 deletions adaptived/tests/ftests/1005-sudo-effect-sd_bus_setting_sub_infinity.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@

static const char * const cgroup_slice_name = "sudo1005.slice";
static long long expected_value;
static const char * const old_conf_file = "/etc/systemd/system.control/sudo1005.slice.d/50-MemoryMax.conf";
static const char * const old_unit_file_dir = "/etc/systemd/system.control/sudo1005.slice.d";

int main(int argc, char *argv[])
{
Expand All @@ -54,6 +56,13 @@ int main(int argc, char *argv[])
char *line = NULL;
size_t len = 0;

/*
* systemd will read from old conf files rather than the cgroup sysfs. Therefore
* delete them
*/
delete_file(old_conf_file);
delete_dir(old_unit_file_dir);

snprintf(config_path, FILENAME_MAX - 1, "%s/1005-sudo-effect-sd_bus_setting_sub_infinity.json", argv[1]);
config_path[FILENAME_MAX - 1] = '\0';

Expand Down
9 changes: 9 additions & 0 deletions adaptived/tests/ftests/1006-sudo-effect-sd_bus_setting_set_int_scope.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
static const char * const cgroup_scope_name = "sudo1006.scope";
static const char * const cgroup_slice_scope_name = "system.slice/sudo1006.scope";
static const int expected_value = 89997312; /* Must be multiple of 4K */
static const char * const old_conf_file = "/etc/systemd/system.control/sudo1006.slice.d/50-MemoryMax.conf";
static const char * const old_unit_file_dir = "/etc/systemd/system.control/sudo1006.slice.d";

int main(int argc, char *argv[])
{
Expand All @@ -49,6 +51,13 @@ int main(int argc, char *argv[])
struct adaptived_ctx *ctx = NULL;
int ret, version;

/*
* systemd will read from old conf files rather than the cgroup sysfs. Therefore
* delete them
*/
delete_file(old_conf_file);
delete_dir(old_unit_file_dir);

snprintf(config_path, FILENAME_MAX - 1, "%s/1006-sudo-effect-sd_bus_setting_set_int_scope.json", argv[1]);
config_path[FILENAME_MAX - 1] = '\0';

Expand Down
9 changes: 9 additions & 0 deletions adaptived/tests/ftests/1007-sudo-effect-sd_bus_setting_set_str.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,22 @@
#define EXPECTED_RET -ETIME

static const char * const cgroup_slice_name = "sudo1007.slice";
static const char * const old_conf_file = "/etc/systemd/system.control/sudo1007.slice.d/50-DevicePolicy.conf";
static const char * const old_unit_file_dir = "/etc/systemd/system.control/sudo1007.slice.d";

int main(int argc, char *argv[])
{
char config_path[FILENAME_MAX];
struct adaptived_ctx *ctx = NULL;
int ret;

/*
* systemd will read from old conf files rather than the cgroup sysfs. Therefore
* delete them
*/
delete_file(old_conf_file);
delete_dir(old_unit_file_dir);

snprintf(config_path, FILENAME_MAX - 1, "%s/1007-sudo-effect-sd_bus_setting_set_str.json", argv[1]);
config_path[FILENAME_MAX - 1] = '\0';

Expand Down
Loading