picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: move conf-parser related tests to test-conf-parser.c

Browse source
This commit is contained in:
Ronny Chevalier 2016-03-03 00:08:10 +01:00
parent 0999c8ade8
commit f55211dbce
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/test/test-conf-parser.c
View file

@ -215,6 +215,14 @@ static void test_config_parse_nsec(void) {
test_config_parse_nsec_one("garbage", 0);
}
static void test_config_parse_iec_uint64(void) {
uint64_t offset = 0;
assert_se(config_parse_iec_uint64(NULL, "/this/file", 11, "Section", 22, "Size", 0, "4M", &offset, NULL) == 0);
assert_se(offset == 4 * 1024 * 1024);
assert_se(config_parse_iec_uint64(NULL, "/this/file", 11, "Section", 22, "Size", 0, "4.5M", &offset, NULL) == 0);
}
int main(int argc, char **argv) {
log_parse_environment();
log_open();
@ -230,6 +238,7 @@ int main(int argc, char **argv) {
test_config_parse_mode();
test_config_parse_sec();
test_config_parse_nsec();
test_config_parse_iec_uint64();
return 0;
}

10
src/test/test-util.c
View file

@ -27,7 +27,6 @@
#include <unistd.h>
#include "alloc-util.h"
#include "conf-parser.h"
#include "def.h"
#include "fd-util.h"
#include "fileio.h"
@ -190,14 +189,6 @@ static void test_protect_errno(void) {
assert_se(errno == 12);
}
static void test_config_parse_iec_uint64(void) {
uint64_t offset = 0;
assert_se(config_parse_iec_uint64(NULL, "/this/file", 11, "Section", 22, "Size", 0, "4M", &offset, NULL) == 0);
assert_se(offset == 4 * 1024 * 1024);
assert_se(config_parse_iec_uint64(NULL, "/this/file", 11, "Section", 22, "Size", 0, "4.5M", &offset, NULL) == 0);
}
static void test_fstab_node_to_udev_node(void) {
char *n;
@ -487,7 +478,6 @@ int main(int argc, char *argv[]) {
test_div_round_up();
test_u64log2();
test_protect_errno();
test_config_parse_iec_uint64();
test_fstab_node_to_udev_node();
test_get_files_in_directory();
test_in_set();