kernel: fix boot module based tests

2 files changed, 11 insertions, 8 deletions

diff --git a/kernel/kernel/devices/storage.tests.cpp b/kernel/kernel/devices/storage.tests.cpp
index 603321c2..a51b6996 100644
--- a/kernel/kernel/devices/storage.tests.cpp
+++ b/kernel/kernel/devices/storage.tests.cpp
@@ -17,7 +17,7 @@ TEST_CASE("Storage devices attached with init() are reachable from the root bus"
   auto registry = kapi::boot_modules::boot_module_registry{};
 
   registry.add_boot_module({
-    .name = "test module",
+    .name = "test_module type=ramdisk",
     .start_address = kapi::memory::linear_address{storage.data()},
     .size = storage.size(),
   });
@@ -26,23 +26,26 @@ TEST_CASE("Storage devices attached with init() are reachable from the root bus"
 
   kernel::devices::storage::init();
 
-  CHECK(kapi::devices::find_device("ram0"));
+  auto block_devices = kapi::devices::interface_registry::get().all(kapi::devices::block_device::id);
+  REQUIRE(block_devices.size() == 1);
+  CHECK(block_devices[0].name() == "ram0");
 
   auto root = kapi::devices::get_root_bus();
-  auto ram_disk_controller_found = false;
+  auto boot_modules_bus_found = false;
 
   for (auto const & child : root->children())
   {
-    if (child->name() == "ram_disk")
+    if (child->name() == "boot_modules")
     {
-      ram_disk_controller_found = true;
+      boot_modules_bus_found = true;
     }
   }
-  CHECK(ram_disk_controller_found);
+  CHECK(boot_modules_bus_found);
 
   auto boot_device = kernel::devices::storage::determine_boot_device();
   REQUIRE(boot_device);
-  CHECK(boot_device->name() == "ram0");
+  CHECK(boot_device->state() == kapi::devices::state::bound);
+  CHECK(boot_device->bound_driver() != nullptr);
 
   kernel::tests::boot_modules::deinit();
 }
\ No newline at end of file
diff --git a/kernel/kernel/test_support/filesystem/storage_boot_module_fixture.cpp b/kernel/kernel/test_support/filesystem/storage_boot_module_fixture.cpp
index 79a9eae1..fbdb01e0 100644
--- a/kernel/kernel/test_support/filesystem/storage_boot_module_fixture.cpp
+++ b/kernel/kernel/test_support/filesystem/storage_boot_module_fixture.cpp
@@ -148,7 +148,7 @@ namespace kernel::tests::filesystem
   auto storage_boot_module_fixture::setup_module_from_img(std::string const & module_name,
                                                           std::filesystem::path const & img_path) -> void
   {
-    m_module_names.push_back(module_name);
+    m_module_names.push_back(module_name + " type=ramdisk");
     auto & mapped_image = m_mapped_images.emplace_back(img_path);
 
     m_registry.add_boot_module(kapi::boot_modules::boot_module{