testsuite: improve coverage of shared/util.h

[thirdparty/kmod.git] / testsuite / test-init.c

diff --git a/testsuite/test-init.c b/testsuite/test-init.c
index 8b2419cf8f6e7264f381ae4e3de1b478f5dec18f..45846f77461fd5740ac61d4fea12c83e0b8de8e0 100644 (file)
--- a/testsuite/test-init.c
+++ b/testsuite/test-init.c
@@ -12,8 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <errno.h>
@@ -24,7 +23,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <libkmod.h>
+#include <shared/macro.h>
+
+#include <libkmod/libkmod.h>
 
 #include "testsuite.h"
 
@@ -82,7 +83,7 @@ DEFINE_TEST(test_insert,
 static noreturn int test_remove(const struct test *t)
 {
        struct kmod_ctx *ctx;
-       struct kmod_module *mod;
+       struct kmod_module *mod_ext4, *mod_bla;
        const char *null_config = NULL;
        int err;
 
@@ -90,17 +91,30 @@ static noreturn int test_remove(const struct test *t)
        if (ctx == NULL)
                exit(EXIT_FAILURE);
 
-       err = kmod_module_new_from_name(ctx, "ext4", &mod);
+       err = kmod_module_new_from_name(ctx, "ext4", &mod_ext4);
+       if (err != 0) {
+               ERR("could not create module from name: %s\n", strerror(-err));
+               exit(EXIT_FAILURE);
+       }
+
+       err = kmod_module_new_from_name(ctx, "bla", &mod_bla);
        if (err != 0) {
-               ERR("could not create module from name: %m\n");
+               ERR("could not create module from name: %s\n", strerror(-err));
                exit(EXIT_FAILURE);
        }
 
-       err = kmod_module_remove_module(mod, 0);
+       err = kmod_module_remove_module(mod_ext4, 0);
        if (err != 0) {
-               ERR("could not remove module: %m\n");
+               ERR("could not remove module: %s\n", strerror(-err));
                exit(EXIT_FAILURE);
        }
+
+       err = kmod_module_remove_module(mod_bla, 0);
+       if (err != -ENOENT) {
+               ERR("wrong return code for failure test: %d\n", err);
+               exit(EXIT_FAILURE);
+       }
+
        kmod_unref(ctx);
 
        exit(EXIT_SUCCESS);
@@ -109,15 +123,9 @@ DEFINE_TEST(test_remove,
        .description = "test if libkmod's remove_module returns ok",
        .config = {
                [TC_ROOTFS] = TESTSUITE_ROOTFS "test-remove/",
-               [TC_DELETE_MODULE_RETCODES] = "bla:1:20",
+               [TC_DELETE_MODULE_RETCODES] =
+                       "ext4:0:0:bla:-1:" STRINGIFY(ENOENT),
        },
        .need_spawn = true);
 
-static const struct test *tests[] = {
-       &stest_initlib,
-       &stest_insert,
-       &stest_remove,
-       NULL,
-};
-
-TESTSUITE_MAIN(tests);
+TESTSUITE_MAIN();