Merge pull request #1272 from ingve/dev

test: modernize some tests

Author: fwsGonzo

test/fs/unit/memdisk_test.cpp

@@ -20,16 +20,16 @@
 
 CASE("memdisk properties")
 {
-  auto disk = fs::new_shared_memdisk();
-  EXPECT(disk->empty() == true);
-  EXPECT(disk->device_id() == 0);
-  EXPECT(disk->fs_ready() == false);
-  EXPECT(disk->name() == "memdisk0");
-  EXPECT(disk->dev().size() == 0ull);
-  EXPECT(disk->dev().device_type() == "Block device");
-  EXPECT(disk->dev().driver_name() == "MemDisk");
+  fs::Disk& disk = fs::memdisk();
+  EXPECT(disk.empty() == true);
+  EXPECT(disk.device_id() == 0);
+  EXPECT(disk.fs_ready() == false);
+  EXPECT(disk.name() == "memdisk0");
+  EXPECT(disk.dev().size() == 0ull);
+  EXPECT(disk.dev().device_type() == "Block device");
+  EXPECT(disk.dev().driver_name() == "MemDisk");
   bool enumerated_partitions {false};
-  
+
   fs::Disk::on_parts_func part_fn = [&enumerated_partitions, &lest_env]
   (fs::error_t err, std::vector<fs::Disk::Partition>& partitions)
   {
@@ -39,6 +39,6 @@ CASE("memdisk properties")
     }
   };
 
-  disk->partitions(part_fn);
+  disk.partitions(part_fn);
   EXPECT(enumerated_partitions == true);
 }

test/posix/integration/conf/service.cpp

@@ -29,11 +29,11 @@ extern "C" void test_sysconf();
 extern "C" void test_pathconf();
 extern "C" void test_pwd();
 
-fs::Disk_ptr& memdisk() {
-  static auto disk = fs::new_shared_memdisk();
+fs::Disk& memdisk() {
+  fs::Disk& disk = fs::memdisk();
 
-  if (not disk->fs_ready()) {
-    disk->init_fs([](fs::error_t err, auto&) {
+  if (not disk.fs_ready()) {
+    disk.init_fs([](fs::error_t err, auto&) {
         if (err) {
           printf("ERROR MOUNTING DISK\n");
           printf("%s\n", err.reason().c_str());
@@ -58,7 +58,7 @@ int main(int, char **) {
   test_sysconf();
 
   // mount a disk with contents for testing
-  auto root = memdisk()->fs().stat("/");
+  auto root = memdisk().fs().stat("/");
   fs::mount("/etc", root, "test fs");
   test_pathconf();