summaryrefslogtreecommitdiff
path: root/test/unit
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2018-11-29 22:52:46 +0100
committerZdenek Kabelac <zkabelac@redhat.com>2018-11-29 23:10:09 +0100
commit41afe8c5cc7cde890a031ccac1cff0bf9d72220d (patch)
tree6d7accf309fd45d21c0ca2296f9dbc495021532a /test/unit
parente940293c336b22e018aac96217e5e67b2397dde6 (diff)
downloadlvm2-41afe8c5cc7cde890a031ccac1cff0bf9d72220d.tar.gz
tests: drop use_lvmetad from unit test
Diffstat (limited to 'test/unit')
-rw-r--r--test/unit/activation-generator_t.c26
1 files changed, 12 insertions, 14 deletions
diff --git a/test/unit/activation-generator_t.c b/test/unit/activation-generator_t.c
index cff096888..f02da05fc 100644
--- a/test/unit/activation-generator_t.c
+++ b/test/unit/activation-generator_t.c
@@ -129,20 +129,19 @@ static void _test_parse_line(void *fixture)
for (i = 0; i< DM_ARRAY_SIZE(_tests); i++) {
bool r;
- struct config cfg;
+ struct config cfg = {
+ .sysinit_needed = true
+ };
struct pl_test *t = _tests + i;
- cfg.use_lvmetad = false;
- cfg.sysinit_needed = true;
-
r = _parse_line(t->input, &cfg);
if (t->success) {
if (!r)
test_fail("_parse_line('%s') failed", t->input);
- if (cfg.use_lvmetad != t->use_lvmetad)
- test_fail("_parse_line('%s') -> use_lvmetad='%s'",
- t->input, _bool(cfg.use_lvmetad));
+ //if (cfg.use_lvmetad != t->use_lvmetad)
+ // test_fail("_parse_line('%s') -> use_lvmetad='%s'",
+ // t->input, _bool(cfg.use_lvmetad));
if (cfg.sysinit_needed != t->sysinit_needed)
test_fail("_parse_line('%s') -> sysinit_needed='%s'",
@@ -207,14 +206,13 @@ static void _test_get_config(void *fixture)
bool r;
unsigned i;
- struct config cfg;
const char *path;
for (i = 0; i < DM_ARRAY_SIZE(_tests); i++) {
struct gc_test *t = _tests + i;
-
- cfg.use_lvmetad = false;
- cfg.sysinit_needed = true;
+ struct config cfg = {
+ .sysinit_needed = true
+ };
path = _fake_lvmconfig(t->output);
if (!path)
@@ -225,9 +223,9 @@ static void _test_get_config(void *fixture)
if (!r)
test_fail("_get_config() <- '%s' failed", t->output);
- if (t->use_lvmetad != cfg.use_lvmetad)
- test_fail("_get_config() <- '%s', use_lvmetad = %s",
- t->output, _bool(cfg.use_lvmetad));
+ //if (t->use_lvmetad != cfg.use_lvmetad)
+ // test_fail("_get_config() <- '%s', use_lvmetad = %s",
+ // t->output, _bool(cfg.use_lvmetad));
if (t->sysinit_needed != cfg.sysinit_needed)
test_fail("_get_config() <- '%s', sysinit = %s",