X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=tests.c;h=5f05e6bab53b36ea169a3d0b48dfca9bbe4f5bf4;hp=b59192c745adb44769e0db4c811a2ea745f7db32;hb=92804dec7c4982d2039f81586bc4a5cacb46217b;hpb=adefe14e308a0f8cf73f9c60693a3dbbded157b9

diff --git a/tests.c b/tests.c
index b59192c..5f05e6b 100644
--- a/tests.c
+++ b/tests.c
@@ -45,9 +45,60 @@ static void print_strings (char * const * const argv)
     printf ("\t%s\n", argv[argc]);
 }
 
-static int test_mount_0 (void)
+/*
+static void print_table (char * const * const argv)
 {
-  /* InitEmpty for mount (0) */
+  int i;
+
+  for (i = 0; argv[i] != NULL; i += 2)
+    printf ("%s: %s\n", argv[i], argv[i+1]);
+}
+*/
+
+static void no_test_warnings (void)
+{
+  fprintf (stderr, "warning: \"guestfs_launch\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_wait_ready\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_kill_subprocess\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_add_drive\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_add_cdrom\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_config\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_set_path\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_get_path\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_set_autosync\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_get_autosync\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_set_verbose\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_get_verbose\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_ll\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_pvs_full\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_vgs_full\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_lvs_full\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_init\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_close\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_defvar\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_defnode\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_get\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_set\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_insert\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_rm\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_mv\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_match\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_save\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_load\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_ls\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_chmod\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_chown\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_sfdisk\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_lvm_remove_all\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_command\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_command_lines\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_tune2fs_l\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_blockdev_setbsz\" has no tests\n");
+}
+
+static int test_blockdev_rereadpt_0 (void)
+{
+  /* InitEmpty for blockdev_rereadpt (0) */
   {
     int r;
     suppress_error = 0;
@@ -62,57 +113,48 @@ static int test_mount_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutput for mount (0) */
+  /* TestRun for blockdev_rereadpt (0) */
   {
-    char *lines[] = {
-      ",",
-      NULL
-    };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_blockdev_rereadpt (g, "/dev/sda");
     if (r == -1)
       return -1;
   }
+  return 0;
+}
+
+static int test_blockdev_flushbufs_0 (void)
+{
+  /* InitEmpty for blockdev_flushbufs (0) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_umount_all (g);
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_lvm_remove_all (g);
     if (r == -1)
       return -1;
   }
+  /* TestRun for blockdev_flushbufs (0) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "new file contents", 0);
+    r = guestfs_blockdev_flushbufs (g, "/dev/sda");
     if (r == -1)
       return -1;
   }
-  {
-    char *r;
-    suppress_error = 0;
-    r = guestfs_cat (g, "/new");
-    if (r == NULL)
-      return -1;
-    if (strcmp (r, "new file contents") != 0) {
-      fprintf (stderr, "test_mount_0: expected \"new file contents\" but got \"%s\"\n", r);
-      return -1;
-    }
-    free (r);
-  }
   return 0;
 }
 
-static int test_sync_0 (void)
+static int test_blockdev_getsize64_0 (void)
 {
-  /* InitEmpty for sync (0) */
+  /* InitEmpty for blockdev_getsize64 (0) */
   {
     int r;
     suppress_error = 0;
@@ -127,20 +169,24 @@ static int test_sync_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestRun for sync (0) */
+  /* TestOutputInt for blockdev_getsize64 (0) */
   {
-    int r;
+    int64_t r;
     suppress_error = 0;
-    r = guestfs_sync (g);
+    r = guestfs_blockdev_getsize64 (g, "/dev/sda");
     if (r == -1)
       return -1;
+    if (r != 524288000) {
+      fprintf (stderr, "test_blockdev_getsize64_0: expected 524288000 but got %d\n",               (int) r);
+      return -1;
+    }
   }
   return 0;
 }
 
-static int test_touch_0 (void)
+static int test_blockdev_getsz_0 (void)
 {
-  /* InitBasicFS for touch (0): create ext2 on /dev/sda1 */
+  /* InitEmpty for blockdev_getsz (0) */
   {
     int r;
     suppress_error = 0;
@@ -155,56 +201,56 @@ static int test_touch_0 (void)
     if (r == -1)
       return -1;
   }
+  /* TestOutputInt for blockdev_getsz (0) */
   {
-    char *lines[] = {
-      ",",
-      NULL
-    };
-    int r;
+    int64_t r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_blockdev_getsz (g, "/dev/sda");
     if (r == -1)
       return -1;
-  }
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
-    if (r == -1)
+    if (r != 1024000) {
+      fprintf (stderr, "test_blockdev_getsz_0: expected 1024000 but got %d\n",               (int) r);
       return -1;
+    }
   }
+  return 0;
+}
+
+static int test_blockdev_getbsz_0 (void)
+{
+  /* InitEmpty for blockdev_getbsz (0) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_umount_all (g);
     if (r == -1)
       return -1;
   }
-  /* TestOutputTrue for touch (0) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/new");
+    r = guestfs_lvm_remove_all (g);
     if (r == -1)
       return -1;
   }
+  /* TestOutputInt for blockdev_getbsz (0) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_exists (g, "/new");
+    r = guestfs_blockdev_getbsz (g, "/dev/sda");
     if (r == -1)
       return -1;
-    if (!r) {
-      fprintf (stderr, "test_touch_0: expected true, got false\n");
+    if (r != 4096) {
+      fprintf (stderr, "test_blockdev_getbsz_0: expected 4096 but got %d\n",               (int) r);
       return -1;
     }
   }
   return 0;
 }
 
-static int test_cat_0 (void)
+static int test_blockdev_getss_0 (void)
 {
-  /* InitBasicFS for cat (0): create ext2 on /dev/sda1 */
+  /* InitEmpty for blockdev_getss (0) */
   {
     int r;
     suppress_error = 0;
@@ -219,57 +265,63 @@ static int test_cat_0 (void)
     if (r == -1)
       return -1;
   }
+  /* TestOutputInt for blockdev_getss (0) */
   {
-    char *lines[] = {
-      ",",
-      NULL
-    };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_blockdev_getss (g, "/dev/sda");
     if (r == -1)
       return -1;
+    if (r != 512) {
+      fprintf (stderr, "test_blockdev_getss_0: expected 512 but got %d\n",               (int) r);
+      return -1;
+    }
   }
+  return 0;
+}
+
+static int test_blockdev_getro_0 (void)
+{
+  /* InitEmpty for blockdev_getro (0) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_umount_all (g);
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_lvm_remove_all (g);
     if (r == -1)
       return -1;
   }
-  /* TestOutput for cat (0) */
+  /* TestOutputTrue for blockdev_getro (0) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "new file contents", 0);
+    r = guestfs_blockdev_setro (g, "/dev/sda");
     if (r == -1)
       return -1;
   }
   {
-    char *r;
+    int r;
     suppress_error = 0;
-    r = guestfs_cat (g, "/new");
-    if (r == NULL)
+    r = guestfs_blockdev_getro (g, "/dev/sda");
+    if (r == -1)
       return -1;
-    if (strcmp (r, "new file contents") != 0) {
-      fprintf (stderr, "test_cat_0: expected \"new file contents\" but got \"%s\"\n", r);
+    if (!r) {
+      fprintf (stderr, "test_blockdev_getro_0: expected true, got false\n");
       return -1;
     }
-    free (r);
   }
   return 0;
 }
 
-static int test_ls_0 (void)
+static int test_blockdev_setrw_0 (void)
 {
-  /* InitBasicFS for ls (0): create ext2 on /dev/sda1 */
+  /* InitEmpty for blockdev_setrw (0) */
   {
     int r;
     suppress_error = 0;
@@ -284,111 +336,70 @@ static int test_ls_0 (void)
     if (r == -1)
       return -1;
   }
+  /* TestOutputFalse for blockdev_setrw (0) */
   {
-    char *lines[] = {
-      ",",
-      NULL
-    };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_blockdev_setrw (g, "/dev/sda");
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_blockdev_getro (g, "/dev/sda");
     if (r == -1)
       return -1;
+    if (r) {
+      fprintf (stderr, "test_blockdev_setrw_0: expected false, got true\n");
+      return -1;
+    }
   }
+  return 0;
+}
+
+static int test_blockdev_setro_0 (void)
+{
+  /* InitEmpty for blockdev_setro (0) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_umount_all (g);
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for ls (0) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/new");
+    r = guestfs_lvm_remove_all (g);
     if (r == -1)
       return -1;
   }
+  /* TestOutputTrue for blockdev_setro (0) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/newer");
+    r = guestfs_blockdev_setro (g, "/dev/sda");
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/newest");
+    r = guestfs_blockdev_getro (g, "/dev/sda");
     if (r == -1)
       return -1;
-  }
-  {
-    char **r;
-    int i;
-    suppress_error = 0;
-    r = guestfs_ls (g, "/");
-    if (r == NULL)
-      return -1;
-    if (!r[0]) {
-      fprintf (stderr, "test_ls_0: short list returned from command\n");
-      print_strings (r);
-      return -1;
-    }
-    if (strcmp (r[0], "lost+found") != 0) {
-      fprintf (stderr, "test_ls_0: expected \"lost+found\" but got \"%s\"\n", r[0]);
-      return -1;
-    }
-    if (!r[1]) {
-      fprintf (stderr, "test_ls_0: short list returned from command\n");
-      print_strings (r);
-      return -1;
-    }
-    if (strcmp (r[1], "new") != 0) {
-      fprintf (stderr, "test_ls_0: expected \"new\" but got \"%s\"\n", r[1]);
-      return -1;
-    }
-    if (!r[2]) {
-      fprintf (stderr, "test_ls_0: short list returned from command\n");
-      print_strings (r);
-      return -1;
-    }
-    if (strcmp (r[2], "newer") != 0) {
-      fprintf (stderr, "test_ls_0: expected \"newer\" but got \"%s\"\n", r[2]);
-      return -1;
-    }
-    if (!r[3]) {
-      fprintf (stderr, "test_ls_0: short list returned from command\n");
-      print_strings (r);
-      return -1;
-    }
-    if (strcmp (r[3], "newest") != 0) {
-      fprintf (stderr, "test_ls_0: expected \"newest\" but got \"%s\"\n", r[3]);
-      return -1;
-    }
-    if (r[4] != NULL) {
-      fprintf (stderr, "test_ls_0: extra elements returned from command\n");
-      print_strings (r);
+    if (!r) {
+      fprintf (stderr, "test_blockdev_setro_0: expected true, got false\n");
       return -1;
     }
-    for (i = 0; r[i] != NULL; ++i)
-      free (r[i]);
-    free (r);
   }
   return 0;
 }
 
-static int test_list_devices_0 (void)
+static int test_statvfs_0 (void)
 {
-  /* InitEmpty for list_devices (0) */
+  /* InitBasicFS for statvfs (0): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -403,56 +414,61 @@ static int test_list_devices_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for list_devices (0) */
   {
-    char **r;
-    int i;
+    char *lines[] = {
+      ",",
+      NULL
+    };
+    int r;
     suppress_error = 0;
-    r = guestfs_list_devices (g);
-    if (r == NULL)
-      return -1;
-    if (!r[0]) {
-      fprintf (stderr, "test_list_devices_0: short list returned from command\n");
-      print_strings (r);
+    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    if (r == -1)
       return -1;
-    }
-    if (strcmp (r[0], "/dev/sda") != 0) {
-      fprintf (stderr, "test_list_devices_0: expected \"/dev/sda\" but got \"%s\"\n", r[0]);
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    if (r == -1)
       return -1;
-    }
-    if (!r[1]) {
-      fprintf (stderr, "test_list_devices_0: short list returned from command\n");
-      print_strings (r);
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, "/dev/sda1", "/");
+    if (r == -1)
       return -1;
-    }
-    if (strcmp (r[1], "/dev/sdb") != 0) {
-      fprintf (stderr, "test_list_devices_0: expected \"/dev/sdb\" but got \"%s\"\n", r[1]);
+  }
+  /* TestOutputStruct for statvfs (0) */
+  {
+    struct guestfs_statvfs *r;
+    suppress_error = 0;
+    r = guestfs_statvfs (g, "/");
+    if (r == NULL)
       return -1;
-    }
-    if (!r[2]) {
-      fprintf (stderr, "test_list_devices_0: short list returned from command\n");
-      print_strings (r);
+    if (r->bfree != 487702) {
+      fprintf (stderr, "test_statvfs_0: bfree was %d, expected 487702\n",
+               (int) r->bfree);
       return -1;
     }
-    if (strcmp (r[2], "/dev/sdc") != 0) {
-      fprintf (stderr, "test_list_devices_0: expected \"/dev/sdc\" but got \"%s\"\n", r[2]);
+    if (r->blocks != 490020) {
+      fprintf (stderr, "test_statvfs_0: blocks was %d, expected 490020\n",
+               (int) r->blocks);
       return -1;
     }
-    if (r[3] != NULL) {
-      fprintf (stderr, "test_list_devices_0: extra elements returned from command\n");
-      print_strings (r);
+    if (r->bsize != 1024) {
+      fprintf (stderr, "test_statvfs_0: bsize was %d, expected 1024\n",
+               (int) r->bsize);
       return -1;
     }
-    for (i = 0; r[i] != NULL; ++i)
-      free (r[i]);
     free (r);
   }
   return 0;
 }
 
-static int test_list_partitions_0 (void)
+static int test_lstat_0 (void)
 {
-  /* InitBasicFS for list_partitions (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for lstat (0): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -492,38 +508,33 @@ static int test_list_partitions_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for list_partitions (0) */
+  /* TestOutputStruct for lstat (0) */
   {
-    char **r;
-    int i;
+    int r;
     suppress_error = 0;
-    r = guestfs_list_partitions (g);
-    if (r == NULL)
-      return -1;
-    if (!r[0]) {
-      fprintf (stderr, "test_list_partitions_0: short list returned from command\n");
-      print_strings (r);
+    r = guestfs_touch (g, "/new");
+    if (r == -1)
       return -1;
-    }
-    if (strcmp (r[0], "/dev/sda1") != 0) {
-      fprintf (stderr, "test_list_partitions_0: expected \"/dev/sda1\" but got \"%s\"\n", r[0]);
+  }
+  {
+    struct guestfs_stat *r;
+    suppress_error = 0;
+    r = guestfs_lstat (g, "/new");
+    if (r == NULL)
       return -1;
-    }
-    if (r[1] != NULL) {
-      fprintf (stderr, "test_list_partitions_0: extra elements returned from command\n");
-      print_strings (r);
+    if (r->size != 0) {
+      fprintf (stderr, "test_lstat_0: size was %d, expected 0\n",
+               (int) r->size);
       return -1;
     }
-    for (i = 0; r[i] != NULL; ++i)
-      free (r[i]);
     free (r);
   }
   return 0;
 }
 
-static int test_list_partitions_1 (void)
+static int test_stat_0 (void)
 {
-  /* InitEmpty for list_partitions (1) */
+  /* InitBasicFS for stat (0): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -538,11 +549,8 @@ static int test_list_partitions_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for list_partitions (1) */
   {
     char *lines[] = {
-      ",10",
-      ",20",
       ",",
       NULL
     };
@@ -553,54 +561,640 @@ static int test_list_partitions_1 (void)
       return -1;
   }
   {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, "/dev/sda1", "/");
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputStruct for stat (0) */
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_touch (g, "/new");
+    if (r == -1)
+      return -1;
+  }
+  {
+    struct guestfs_stat *r;
+    suppress_error = 0;
+    r = guestfs_stat (g, "/new");
+    if (r == NULL)
+      return -1;
+    if (r->size != 0) {
+      fprintf (stderr, "test_stat_0: size was %d, expected 0\n",
+               (int) r->size);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_file_0 (void)
+{
+  /* InitBasicFS for file (0): create ext2 on /dev/sda1 */
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char *lines[] = {
+      ",",
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, "/dev/sda1", "/");
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for file (0) */
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_touch (g, "/new");
+    if (r == -1)
+      return -1;
+  }
+  {
+    char *r;
+    suppress_error = 0;
+    r = guestfs_file (g, "/new");
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, "empty") != 0) {
+      fprintf (stderr, "test_file_0: expected \"empty\" but got \"%s\"\n", r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_file_1 (void)
+{
+  /* InitBasicFS for file (1): create ext2 on /dev/sda1 */
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char *lines[] = {
+      ",",
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, "/dev/sda1", "/");
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for file (1) */
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, "/new", "some content\n", 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char *r;
+    suppress_error = 0;
+    r = guestfs_file (g, "/new");
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, "ASCII text") != 0) {
+      fprintf (stderr, "test_file_1: expected \"ASCII text\" but got \"%s\"\n", r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_file_2 (void)
+{
+  /* InitBasicFS for file (2): create ext2 on /dev/sda1 */
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char *lines[] = {
+      ",",
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, "/dev/sda1", "/");
+    if (r == -1)
+      return -1;
+  }
+  /* TestLastFail for file (2) */
+  {
+    char *r;
+    suppress_error = 1;
+    r = guestfs_file (g, "/nofile");
+    if (r != NULL)
+      return -1;
+    free (r);
+  }
+  return 0;
+}
+
+static int test_umount_all_0 (void)
+{
+  /* InitBasicFS for umount_all (0): create ext2 on /dev/sda1 */
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char *lines[] = {
+      ",",
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, "/dev/sda1", "/");
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputList for umount_all (0) */
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_mounts (g);
+    if (r == NULL)
+      return -1;
+    if (r[0] != NULL) {
+      fprintf (stderr, "test_umount_all_0: extra elements returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
+    free (r);
+  }
+  return 0;
+}
+
+static int test_mounts_0 (void)
+{
+  /* InitBasicFS for mounts (0): create ext2 on /dev/sda1 */
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char *lines[] = {
+      ",",
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, "/dev/sda1", "/");
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputList for mounts (0) */
+  {
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_mounts (g);
+    if (r == NULL)
+      return -1;
+    if (!r[0]) {
+      fprintf (stderr, "test_mounts_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[0], "/dev/sda1") != 0) {
+      fprintf (stderr, "test_mounts_0: expected \"/dev/sda1\" but got \"%s\"\n", r[0]);
+      return -1;
+    }
+    if (r[1] != NULL) {
+      fprintf (stderr, "test_mounts_0: extra elements returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
+    free (r);
+  }
+  return 0;
+}
+
+static int test_umount_0 (void)
+{
+  /* InitEmpty for umount (0) */
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputList for umount (0) */
+  {
+    char *lines[] = {
+      ",",
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, "/dev/sda1", "/");
+    if (r == -1)
+      return -1;
+  }
+  {
     char **r;
     int i;
     suppress_error = 0;
-    r = guestfs_list_partitions (g);
+    r = guestfs_mounts (g);
     if (r == NULL)
       return -1;
     if (!r[0]) {
-      fprintf (stderr, "test_list_partitions_1: short list returned from command\n");
+      fprintf (stderr, "test_umount_0: short list returned from command\n");
       print_strings (r);
       return -1;
     }
     if (strcmp (r[0], "/dev/sda1") != 0) {
-      fprintf (stderr, "test_list_partitions_1: expected \"/dev/sda1\" but got \"%s\"\n", r[0]);
+      fprintf (stderr, "test_umount_0: expected \"/dev/sda1\" but got \"%s\"\n", r[0]);
       return -1;
     }
-    if (!r[1]) {
-      fprintf (stderr, "test_list_partitions_1: short list returned from command\n");
+    if (r[1] != NULL) {
+      fprintf (stderr, "test_umount_0: extra elements returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[1], "/dev/sda2") != 0) {
-      fprintf (stderr, "test_list_partitions_1: expected \"/dev/sda2\" but got \"%s\"\n", r[1]);
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
+    free (r);
+  }
+  return 0;
+}
+
+static int test_umount_1 (void)
+{
+  /* InitEmpty for umount (1) */
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
       return -1;
-    }
-    if (!r[2]) {
-      fprintf (stderr, "test_list_partitions_1: short list returned from command\n");
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputList for umount (1) */
+  {
+    char *lines[] = {
+      ",",
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, "/dev/sda1", "/");
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount (g, "/");
+    if (r == -1)
+      return -1;
+  }
+  {
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_mounts (g);
+    if (r == NULL)
+      return -1;
+    if (r[0] != NULL) {
+      fprintf (stderr, "test_umount_1: extra elements returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[2], "/dev/sda3") != 0) {
-      fprintf (stderr, "test_list_partitions_1: expected \"/dev/sda3\" but got \"%s\"\n", r[2]);
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
+    free (r);
+  }
+  return 0;
+}
+
+static int test_write_file_0 (void)
+{
+  /* InitBasicFS for write_file (0): create ext2 on /dev/sda1 */
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char *lines[] = {
+      ",",
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, "/dev/sda1", "/");
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for write_file (0) */
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, "/new", "new file contents", 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char *r;
+    suppress_error = 0;
+    r = guestfs_cat (g, "/new");
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, "new file contents") != 0) {
+      fprintf (stderr, "test_write_file_0: expected \"new file contents\" but got \"%s\"\n", r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_write_file_1 (void)
+{
+  /* InitBasicFS for write_file (1): create ext2 on /dev/sda1 */
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char *lines[] = {
+      ",",
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, "/dev/sda1", "/");
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for write_file (1) */
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, "/new", "\nnew file contents\n", 0);
+    if (r == -1)
       return -1;
-    }
-    if (r[3] != NULL) {
-      fprintf (stderr, "test_list_partitions_1: extra elements returned from command\n");
-      print_strings (r);
+  }
+  {
+    char *r;
+    suppress_error = 0;
+    r = guestfs_cat (g, "/new");
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, "\nnew file contents\n") != 0) {
+      fprintf (stderr, "test_write_file_1: expected \"\nnew file contents\n\" but got \"%s\"\n", r);
       return -1;
     }
-    for (i = 0; r[i] != NULL; ++i)
-      free (r[i]);
     free (r);
   }
   return 0;
 }
 
-static int test_pvs_0 (void)
+static int test_write_file_2 (void)
 {
-  /* InitBasicFSonLVM for pvs (0): create ext2 on /dev/VG/LV */
+  /* InitBasicFS for write_file (2): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -629,74 +1223,43 @@ static int test_pvs_0 (void)
   {
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda1");
-    if (r == -1)
-      return -1;
-  }
-  {
-    char *physvols[] = {
-      "/dev/sda1",
-      NULL
-    };
-    int r;
-    suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG", physvols);
-    if (r == -1)
-      return -1;
-  }
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV", "VG", 8);
+    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/VG/LV");
+    r = guestfs_mount (g, "/dev/sda1", "/");
     if (r == -1)
       return -1;
   }
+  /* TestOutput for write_file (2) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/VG/LV", "/");
+    r = guestfs_write_file (g, "/new", "\n\n", 0);
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for pvs (0) */
   {
-    char **r;
-    int i;
+    char *r;
     suppress_error = 0;
-    r = guestfs_pvs (g);
+    r = guestfs_cat (g, "/new");
     if (r == NULL)
       return -1;
-    if (!r[0]) {
-      fprintf (stderr, "test_pvs_0: short list returned from command\n");
-      print_strings (r);
-      return -1;
-    }
-    if (strcmp (r[0], "/dev/sda1") != 0) {
-      fprintf (stderr, "test_pvs_0: expected \"/dev/sda1\" but got \"%s\"\n", r[0]);
-      return -1;
-    }
-    if (r[1] != NULL) {
-      fprintf (stderr, "test_pvs_0: extra elements returned from command\n");
-      print_strings (r);
+    if (strcmp (r, "\n\n") != 0) {
+      fprintf (stderr, "test_write_file_2: expected \"\n\n\" but got \"%s\"\n", r);
       return -1;
     }
-    for (i = 0; r[i] != NULL; ++i)
-      free (r[i]);
     free (r);
   }
   return 0;
 }
 
-static int test_pvs_1 (void)
+static int test_write_file_3 (void)
 {
-  /* InitEmpty for pvs (1) */
+  /* InitBasicFS for write_file (3): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -711,11 +1274,8 @@ static int test_pvs_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for pvs (1) */
   {
     char *lines[] = {
-      ",10",
-      ",20",
       ",",
       NULL
     };
@@ -728,73 +1288,43 @@ static int test_pvs_1 (void)
   {
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda1");
+    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda2");
+    r = guestfs_mount (g, "/dev/sda1", "/");
     if (r == -1)
       return -1;
   }
+  /* TestOutput for write_file (3) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda3");
+    r = guestfs_write_file (g, "/new", "", 0);
     if (r == -1)
       return -1;
   }
   {
-    char **r;
-    int i;
+    char *r;
     suppress_error = 0;
-    r = guestfs_pvs (g);
+    r = guestfs_cat (g, "/new");
     if (r == NULL)
       return -1;
-    if (!r[0]) {
-      fprintf (stderr, "test_pvs_1: short list returned from command\n");
-      print_strings (r);
-      return -1;
-    }
-    if (strcmp (r[0], "/dev/sda1") != 0) {
-      fprintf (stderr, "test_pvs_1: expected \"/dev/sda1\" but got \"%s\"\n", r[0]);
-      return -1;
-    }
-    if (!r[1]) {
-      fprintf (stderr, "test_pvs_1: short list returned from command\n");
-      print_strings (r);
-      return -1;
-    }
-    if (strcmp (r[1], "/dev/sda2") != 0) {
-      fprintf (stderr, "test_pvs_1: expected \"/dev/sda2\" but got \"%s\"\n", r[1]);
-      return -1;
-    }
-    if (!r[2]) {
-      fprintf (stderr, "test_pvs_1: short list returned from command\n");
-      print_strings (r);
-      return -1;
-    }
-    if (strcmp (r[2], "/dev/sda3") != 0) {
-      fprintf (stderr, "test_pvs_1: expected \"/dev/sda3\" but got \"%s\"\n", r[2]);
-      return -1;
-    }
-    if (r[3] != NULL) {
-      fprintf (stderr, "test_pvs_1: extra elements returned from command\n");
-      print_strings (r);
+    if (strcmp (r, "") != 0) {
+      fprintf (stderr, "test_write_file_3: expected \"\" but got \"%s\"\n", r);
       return -1;
     }
-    for (i = 0; r[i] != NULL; ++i)
-      free (r[i]);
     free (r);
   }
   return 0;
 }
 
-static int test_vgs_0 (void)
+static int test_write_file_4 (void)
 {
-  /* InitBasicFSonLVM for vgs (0): create ext2 on /dev/VG/LV */
+  /* InitBasicFS for write_file (4): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -823,74 +1353,43 @@ static int test_vgs_0 (void)
   {
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda1");
-    if (r == -1)
-      return -1;
-  }
-  {
-    char *physvols[] = {
-      "/dev/sda1",
-      NULL
-    };
-    int r;
-    suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG", physvols);
-    if (r == -1)
-      return -1;
-  }
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV", "VG", 8);
+    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/VG/LV");
+    r = guestfs_mount (g, "/dev/sda1", "/");
     if (r == -1)
       return -1;
   }
+  /* TestOutput for write_file (4) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/VG/LV", "/");
+    r = guestfs_write_file (g, "/new", "\n\n\n", 0);
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for vgs (0) */
   {
-    char **r;
-    int i;
+    char *r;
     suppress_error = 0;
-    r = guestfs_vgs (g);
+    r = guestfs_cat (g, "/new");
     if (r == NULL)
       return -1;
-    if (!r[0]) {
-      fprintf (stderr, "test_vgs_0: short list returned from command\n");
-      print_strings (r);
-      return -1;
-    }
-    if (strcmp (r[0], "VG") != 0) {
-      fprintf (stderr, "test_vgs_0: expected \"VG\" but got \"%s\"\n", r[0]);
-      return -1;
-    }
-    if (r[1] != NULL) {
-      fprintf (stderr, "test_vgs_0: extra elements returned from command\n");
-      print_strings (r);
+    if (strcmp (r, "\n\n\n") != 0) {
+      fprintf (stderr, "test_write_file_4: expected \"\n\n\n\" but got \"%s\"\n", r);
       return -1;
     }
-    for (i = 0; r[i] != NULL; ++i)
-      free (r[i]);
     free (r);
   }
   return 0;
 }
 
-static int test_vgs_1 (void)
+static int test_write_file_5 (void)
 {
-  /* InitEmpty for vgs (1) */
+  /* InitBasicFS for write_file (5): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -905,11 +1404,8 @@ static int test_vgs_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for vgs (1) */
   {
     char *lines[] = {
-      ",10",
-      ",20",
       ",",
       NULL
     };
@@ -922,87 +1418,43 @@ static int test_vgs_1 (void)
   {
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda1");
-    if (r == -1)
-      return -1;
-  }
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda2");
-    if (r == -1)
-      return -1;
-  }
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda3");
+    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
     if (r == -1)
       return -1;
   }
   {
-    char *physvols[] = {
-      "/dev/sda1",
-      "/dev/sda2",
-      NULL
-    };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG1", physvols);
+    r = guestfs_mount (g, "/dev/sda1", "/");
     if (r == -1)
       return -1;
   }
+  /* TestOutput for write_file (5) */
   {
-    char *physvols[] = {
-      "/dev/sda3",
-      NULL
-    };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG2", physvols);
+    r = guestfs_write_file (g, "/new", "\n", 0);
     if (r == -1)
       return -1;
   }
   {
-    char **r;
-    int i;
+    char *r;
     suppress_error = 0;
-    r = guestfs_vgs (g);
+    r = guestfs_cat (g, "/new");
     if (r == NULL)
       return -1;
-    if (!r[0]) {
-      fprintf (stderr, "test_vgs_1: short list returned from command\n");
-      print_strings (r);
-      return -1;
-    }
-    if (strcmp (r[0], "VG1") != 0) {
-      fprintf (stderr, "test_vgs_1: expected \"VG1\" but got \"%s\"\n", r[0]);
-      return -1;
-    }
-    if (!r[1]) {
-      fprintf (stderr, "test_vgs_1: short list returned from command\n");
-      print_strings (r);
-      return -1;
-    }
-    if (strcmp (r[1], "VG2") != 0) {
-      fprintf (stderr, "test_vgs_1: expected \"VG2\" but got \"%s\"\n", r[1]);
-      return -1;
-    }
-    if (r[2] != NULL) {
-      fprintf (stderr, "test_vgs_1: extra elements returned from command\n");
-      print_strings (r);
+    if (strcmp (r, "\n") != 0) {
+      fprintf (stderr, "test_write_file_5: expected \"\n\" but got \"%s\"\n", r);
       return -1;
     }
-    for (i = 0; r[i] != NULL; ++i)
-      free (r[i]);
     free (r);
   }
   return 0;
 }
 
-static int test_lvs_0 (void)
+static int test_mkfs_0 (void)
 {
-  /* InitBasicFSonLVM for lvs (0): create ext2 on /dev/VG/LV */
+  /* InitEmpty for mkfs (0) */
   {
     int r;
     suppress_error = 0;
@@ -1017,6 +1469,7 @@ static int test_lvs_0 (void)
     if (r == -1)
       return -1;
   }
+  /* TestOutput for mkfs (0) */
   {
     char *lines[] = {
       ",",
@@ -1031,74 +1484,42 @@ static int test_lvs_0 (void)
   {
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda1");
-    if (r == -1)
-      return -1;
-  }
-  {
-    char *physvols[] = {
-      "/dev/sda1",
-      NULL
-    };
-    int r;
-    suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG", physvols);
-    if (r == -1)
-      return -1;
-  }
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV", "VG", 8);
+    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/VG/LV");
+    r = guestfs_mount (g, "/dev/sda1", "/");
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/VG/LV", "/");
+    r = guestfs_write_file (g, "/new", "new file contents", 0);
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for lvs (0) */
   {
-    char **r;
-    int i;
+    char *r;
     suppress_error = 0;
-    r = guestfs_lvs (g);
-    if (r == NULL)
-      return -1;
-    if (!r[0]) {
-      fprintf (stderr, "test_lvs_0: short list returned from command\n");
-      print_strings (r);
-      return -1;
-    }
-    if (strcmp (r[0], "/dev/VG/LV") != 0) {
-      fprintf (stderr, "test_lvs_0: expected \"/dev/VG/LV\" but got \"%s\"\n", r[0]);
+    r = guestfs_cat (g, "/new");
+    if (r == NULL)
       return -1;
-    }
-    if (r[1] != NULL) {
-      fprintf (stderr, "test_lvs_0: extra elements returned from command\n");
-      print_strings (r);
+    if (strcmp (r, "new file contents") != 0) {
+      fprintf (stderr, "test_mkfs_0: expected \"new file contents\" but got \"%s\"\n", r);
       return -1;
     }
-    for (i = 0; r[i] != NULL; ++i)
-      free (r[i]);
     free (r);
   }
   return 0;
 }
 
-static int test_lvs_1 (void)
+static int test_lvcreate_0 (void)
 {
-  /* InitEmpty for lvs (1) */
+  /* InitEmpty for lvcreate (0) */
   {
     int r;
     suppress_error = 0;
@@ -1113,7 +1534,7 @@ static int test_lvs_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for lvs (1) */
+  /* TestOutputList for lvcreate (0) */
   {
     char *lines[] = {
       ",10",
@@ -1193,6 +1614,20 @@ static int test_lvs_1 (void)
       return -1;
   }
   {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvcreate (g, "LV4", "VG2", 50);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvcreate (g, "LV5", "VG2", 50);
+    if (r == -1)
+      return -1;
+  }
+  {
     char **r;
     int i;
     suppress_error = 0;
@@ -1200,34 +1635,52 @@ static int test_lvs_1 (void)
     if (r == NULL)
       return -1;
     if (!r[0]) {
-      fprintf (stderr, "test_lvs_1: short list returned from command\n");
+      fprintf (stderr, "test_lvcreate_0: short list returned from command\n");
       print_strings (r);
       return -1;
     }
     if (strcmp (r[0], "/dev/VG1/LV1") != 0) {
-      fprintf (stderr, "test_lvs_1: expected \"/dev/VG1/LV1\" but got \"%s\"\n", r[0]);
+      fprintf (stderr, "test_lvcreate_0: expected \"/dev/VG1/LV1\" but got \"%s\"\n", r[0]);
       return -1;
     }
     if (!r[1]) {
-      fprintf (stderr, "test_lvs_1: short list returned from command\n");
+      fprintf (stderr, "test_lvcreate_0: short list returned from command\n");
       print_strings (r);
       return -1;
     }
     if (strcmp (r[1], "/dev/VG1/LV2") != 0) {
-      fprintf (stderr, "test_lvs_1: expected \"/dev/VG1/LV2\" but got \"%s\"\n", r[1]);
+      fprintf (stderr, "test_lvcreate_0: expected \"/dev/VG1/LV2\" but got \"%s\"\n", r[1]);
       return -1;
     }
     if (!r[2]) {
-      fprintf (stderr, "test_lvs_1: short list returned from command\n");
+      fprintf (stderr, "test_lvcreate_0: short list returned from command\n");
       print_strings (r);
       return -1;
     }
     if (strcmp (r[2], "/dev/VG2/LV3") != 0) {
-      fprintf (stderr, "test_lvs_1: expected \"/dev/VG2/LV3\" but got \"%s\"\n", r[2]);
+      fprintf (stderr, "test_lvcreate_0: expected \"/dev/VG2/LV3\" but got \"%s\"\n", r[2]);
       return -1;
     }
-    if (r[3] != NULL) {
-      fprintf (stderr, "test_lvs_1: extra elements returned from command\n");
+    if (!r[3]) {
+      fprintf (stderr, "test_lvcreate_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[3], "/dev/VG2/LV4") != 0) {
+      fprintf (stderr, "test_lvcreate_0: expected \"/dev/VG2/LV4\" but got \"%s\"\n", r[3]);
+      return -1;
+    }
+    if (!r[4]) {
+      fprintf (stderr, "test_lvcreate_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[4], "/dev/VG2/LV5") != 0) {
+      fprintf (stderr, "test_lvcreate_0: expected \"/dev/VG2/LV5\" but got \"%s\"\n", r[4]);
+      return -1;
+    }
+    if (r[5] != NULL) {
+      fprintf (stderr, "test_lvcreate_0: extra elements returned from command\n");
       print_strings (r);
       return -1;
     }
@@ -1238,9 +1691,9 @@ static int test_lvs_1 (void)
   return 0;
 }
 
-static int test_pvs_full_0 (void)
+static int test_vgcreate_0 (void)
 {
-  /* InitBasicFSonLVM for pvs_full (0): create ext2 on /dev/VG/LV */
+  /* InitEmpty for vgcreate (0) */
   {
     int r;
     suppress_error = 0;
@@ -1255,8 +1708,11 @@ static int test_pvs_full_0 (void)
     if (r == -1)
       return -1;
   }
+  /* TestOutputList for vgcreate (0) */
   {
     char *lines[] = {
+      ",10",
+      ",20",
       ",",
       NULL
     };
@@ -1274,54 +1730,69 @@ static int test_pvs_full_0 (void)
       return -1;
   }
   {
-    char *physvols[] = {
-      "/dev/sda1",
-      NULL
-    };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG", physvols);
+    r = guestfs_pvcreate (g, "/dev/sda2");
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV", "VG", 8);
+    r = guestfs_pvcreate (g, "/dev/sda3");
     if (r == -1)
       return -1;
   }
   {
+    char *physvols[] = {
+      "/dev/sda1",
+      "/dev/sda2",
+      NULL
+    };
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/VG/LV");
+    r = guestfs_vgcreate (g, "VG1", physvols);
     if (r == -1)
       return -1;
   }
   {
+    char *physvols[] = {
+      "/dev/sda3",
+      NULL
+    };
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/VG/LV", "/");
+    r = guestfs_vgcreate (g, "VG2", physvols);
     if (r == -1)
       return -1;
   }
-  /* TestOutputLength for pvs_full (0) */
   {
     char **r;
     int i;
     suppress_error = 0;
-    r = guestfs_pvs (g);
+    r = guestfs_vgs (g);
     if (r == NULL)
       return -1;
-    int j;
-    for (j = 0; j < 1; ++j)
-      if (r[j] == NULL) {
-        fprintf (stderr, "test_pvs_full_0: short list returned\n");
-        print_strings (r);
-        return -1;
-      }
-    if (r[j] != NULL) {
-      fprintf (stderr, "test_pvs_full_0: long list returned\n");
+    if (!r[0]) {
+      fprintf (stderr, "test_vgcreate_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[0], "VG1") != 0) {
+      fprintf (stderr, "test_vgcreate_0: expected \"VG1\" but got \"%s\"\n", r[0]);
+      return -1;
+    }
+    if (!r[1]) {
+      fprintf (stderr, "test_vgcreate_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[1], "VG2") != 0) {
+      fprintf (stderr, "test_vgcreate_0: expected \"VG2\" but got \"%s\"\n", r[1]);
+      return -1;
+    }
+    if (r[2] != NULL) {
+      fprintf (stderr, "test_vgcreate_0: extra elements returned from command\n");
       print_strings (r);
       return -1;
     }
@@ -1332,9 +1803,9 @@ static int test_pvs_full_0 (void)
   return 0;
 }
 
-static int test_vgs_full_0 (void)
+static int test_pvcreate_0 (void)
 {
-  /* InitBasicFSonLVM for vgs_full (0): create ext2 on /dev/VG/LV */
+  /* InitEmpty for pvcreate (0) */
   {
     int r;
     suppress_error = 0;
@@ -1349,8 +1820,11 @@ static int test_vgs_full_0 (void)
     if (r == -1)
       return -1;
   }
+  /* TestOutputList for pvcreate (0) */
   {
     char *lines[] = {
+      ",10",
+      ",20",
       ",",
       NULL
     };
@@ -1368,38 +1842,19 @@ static int test_vgs_full_0 (void)
       return -1;
   }
   {
-    char *physvols[] = {
-      "/dev/sda1",
-      NULL
-    };
-    int r;
-    suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG", physvols);
-    if (r == -1)
-      return -1;
-  }
-  {
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV", "VG", 8);
-    if (r == -1)
-      return -1;
-  }
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/VG/LV");
+    r = guestfs_pvcreate (g, "/dev/sda2");
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/VG/LV", "/");
+    r = guestfs_pvcreate (g, "/dev/sda3");
     if (r == -1)
       return -1;
   }
-  /* TestOutputLength for vgs_full (0) */
   {
     char **r;
     int i;
@@ -1407,15 +1862,35 @@ static int test_vgs_full_0 (void)
     r = guestfs_pvs (g);
     if (r == NULL)
       return -1;
-    int j;
-    for (j = 0; j < 1; ++j)
-      if (r[j] == NULL) {
-        fprintf (stderr, "test_vgs_full_0: short list returned\n");
-        print_strings (r);
-        return -1;
-      }
-    if (r[j] != NULL) {
-      fprintf (stderr, "test_vgs_full_0: long list returned\n");
+    if (!r[0]) {
+      fprintf (stderr, "test_pvcreate_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[0], "/dev/sda1") != 0) {
+      fprintf (stderr, "test_pvcreate_0: expected \"/dev/sda1\" but got \"%s\"\n", r[0]);
+      return -1;
+    }
+    if (!r[1]) {
+      fprintf (stderr, "test_pvcreate_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[1], "/dev/sda2") != 0) {
+      fprintf (stderr, "test_pvcreate_0: expected \"/dev/sda2\" but got \"%s\"\n", r[1]);
+      return -1;
+    }
+    if (!r[2]) {
+      fprintf (stderr, "test_pvcreate_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[2], "/dev/sda3") != 0) {
+      fprintf (stderr, "test_pvcreate_0: expected \"/dev/sda3\" but got \"%s\"\n", r[2]);
+      return -1;
+    }
+    if (r[3] != NULL) {
+      fprintf (stderr, "test_pvcreate_0: extra elements returned from command\n");
       print_strings (r);
       return -1;
     }
@@ -1426,9 +1901,9 @@ static int test_vgs_full_0 (void)
   return 0;
 }
 
-static int test_lvs_full_0 (void)
+static int test_is_dir_0 (void)
 {
-  /* InitBasicFSonLVM for lvs_full (0): create ext2 on /dev/VG/LV */
+  /* InitBasicFS for is_dir (0): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -1457,72 +1932,42 @@ static int test_lvs_full_0 (void)
   {
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda1");
-    if (r == -1)
-      return -1;
-  }
-  {
-    char *physvols[] = {
-      "/dev/sda1",
-      NULL
-    };
-    int r;
-    suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG", physvols);
+    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV", "VG", 8);
+    r = guestfs_mount (g, "/dev/sda1", "/");
     if (r == -1)
       return -1;
   }
+  /* TestOutputFalse for is_dir (0) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/VG/LV");
+    r = guestfs_touch (g, "/new");
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/VG/LV", "/");
+    r = guestfs_is_dir (g, "/new");
     if (r == -1)
       return -1;
-  }
-  /* TestOutputLength for lvs_full (0) */
-  {
-    char **r;
-    int i;
-    suppress_error = 0;
-    r = guestfs_pvs (g);
-    if (r == NULL)
-      return -1;
-    int j;
-    for (j = 0; j < 1; ++j)
-      if (r[j] == NULL) {
-        fprintf (stderr, "test_lvs_full_0: short list returned\n");
-        print_strings (r);
-        return -1;
-      }
-    if (r[j] != NULL) {
-      fprintf (stderr, "test_lvs_full_0: long list returned\n");
-      print_strings (r);
+    if (r) {
+      fprintf (stderr, "test_is_dir_0: expected false, got true\n");
       return -1;
     }
-    for (i = 0; r[i] != NULL; ++i)
-      free (r[i]);
-    free (r);
   }
   return 0;
 }
 
-static int test_read_lines_0 (void)
+static int test_is_dir_1 (void)
 {
-  /* InitBasicFS for read_lines (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for is_dir (1): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -1562,63 +2007,31 @@ static int test_read_lines_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for read_lines (0) */
+  /* TestOutputTrue for is_dir (1) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "line1\r\nline2\nline3", 0);
+    r = guestfs_mkdir (g, "/new");
     if (r == -1)
       return -1;
   }
   {
-    char **r;
-    int i;
+    int r;
     suppress_error = 0;
-    r = guestfs_read_lines (g, "/new");
-    if (r == NULL)
-      return -1;
-    if (!r[0]) {
-      fprintf (stderr, "test_read_lines_0: short list returned from command\n");
-      print_strings (r);
-      return -1;
-    }
-    if (strcmp (r[0], "line1") != 0) {
-      fprintf (stderr, "test_read_lines_0: expected \"line1\" but got \"%s\"\n", r[0]);
-      return -1;
-    }
-    if (!r[1]) {
-      fprintf (stderr, "test_read_lines_0: short list returned from command\n");
-      print_strings (r);
-      return -1;
-    }
-    if (strcmp (r[1], "line2") != 0) {
-      fprintf (stderr, "test_read_lines_0: expected \"line2\" but got \"%s\"\n", r[1]);
-      return -1;
-    }
-    if (!r[2]) {
-      fprintf (stderr, "test_read_lines_0: short list returned from command\n");
-      print_strings (r);
-      return -1;
-    }
-    if (strcmp (r[2], "line3") != 0) {
-      fprintf (stderr, "test_read_lines_0: expected \"line3\" but got \"%s\"\n", r[2]);
+    r = guestfs_is_dir (g, "/new");
+    if (r == -1)
       return -1;
-    }
-    if (r[3] != NULL) {
-      fprintf (stderr, "test_read_lines_0: extra elements returned from command\n");
-      print_strings (r);
+    if (!r) {
+      fprintf (stderr, "test_is_dir_1: expected true, got false\n");
       return -1;
     }
-    for (i = 0; r[i] != NULL; ++i)
-      free (r[i]);
-    free (r);
   }
   return 0;
 }
 
-static int test_read_lines_1 (void)
+static int test_is_file_0 (void)
 {
-  /* InitBasicFS for read_lines (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for is_file (0): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -1658,36 +2071,31 @@ static int test_read_lines_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for read_lines (1) */
+  /* TestOutputTrue for is_file (0) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "", 0);
+    r = guestfs_touch (g, "/new");
     if (r == -1)
       return -1;
   }
   {
-    char **r;
-    int i;
+    int r;
     suppress_error = 0;
-    r = guestfs_read_lines (g, "/new");
-    if (r == NULL)
+    r = guestfs_is_file (g, "/new");
+    if (r == -1)
       return -1;
-    if (r[0] != NULL) {
-      fprintf (stderr, "test_read_lines_1: extra elements returned from command\n");
-      print_strings (r);
+    if (!r) {
+      fprintf (stderr, "test_is_file_0: expected true, got false\n");
       return -1;
     }
-    for (i = 0; r[i] != NULL; ++i)
-      free (r[i]);
-    free (r);
   }
   return 0;
 }
 
-static int test_rm_0 (void)
+static int test_is_file_1 (void)
 {
-  /* InitBasicFS for rm (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for is_file (1): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -1727,27 +2135,31 @@ static int test_rm_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestRun for rm (0) */
+  /* TestOutputFalse for is_file (1) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/new");
+    r = guestfs_mkdir (g, "/new");
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_rm (g, "/new");
+    r = guestfs_is_file (g, "/new");
     if (r == -1)
       return -1;
+    if (r) {
+      fprintf (stderr, "test_is_file_1: expected false, got true\n");
+      return -1;
+    }
   }
   return 0;
 }
 
-static int test_rm_1 (void)
+static int test_exists_0 (void)
 {
-  /* InitBasicFS for rm (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for exists (0): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -1787,20 +2199,31 @@ static int test_rm_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestLastFail for rm (1) */
+  /* TestOutputTrue for exists (0) */
   {
     int r;
-    suppress_error = 1;
-    r = guestfs_rm (g, "/new");
-    if (r != -1)
+    suppress_error = 0;
+    r = guestfs_touch (g, "/new");
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_exists (g, "/new");
+    if (r == -1)
+      return -1;
+    if (!r) {
+      fprintf (stderr, "test_exists_0: expected true, got false\n");
       return -1;
+    }
   }
   return 0;
 }
 
-static int test_rm_2 (void)
+static int test_exists_1 (void)
 {
-  /* InitBasicFS for rm (2): create ext2 on /dev/sda1 */
+  /* InitBasicFS for exists (1): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -1840,7 +2263,7 @@ static int test_rm_2 (void)
     if (r == -1)
       return -1;
   }
-  /* TestLastFail for rm (2) */
+  /* TestOutputTrue for exists (1) */
   {
     int r;
     suppress_error = 0;
@@ -1850,17 +2273,21 @@ static int test_rm_2 (void)
   }
   {
     int r;
-    suppress_error = 1;
-    r = guestfs_rm (g, "/new");
-    if (r != -1)
+    suppress_error = 0;
+    r = guestfs_exists (g, "/new");
+    if (r == -1)
+      return -1;
+    if (!r) {
+      fprintf (stderr, "test_exists_1: expected true, got false\n");
       return -1;
+    }
   }
   return 0;
 }
 
-static int test_rmdir_0 (void)
+static int test_mkdir_p_0 (void)
 {
-  /* InitBasicFS for rmdir (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for mkdir_p (0): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -1900,27 +2327,31 @@ static int test_rmdir_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestRun for rmdir (0) */
+  /* TestOutputTrue for mkdir_p (0) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mkdir (g, "/new");
+    r = guestfs_mkdir_p (g, "/new/foo/bar");
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_rmdir (g, "/new");
+    r = guestfs_is_dir (g, "/new/foo/bar");
     if (r == -1)
       return -1;
+    if (!r) {
+      fprintf (stderr, "test_mkdir_p_0: expected true, got false\n");
+      return -1;
+    }
   }
   return 0;
 }
 
-static int test_rmdir_1 (void)
+static int test_mkdir_p_1 (void)
 {
-  /* InitBasicFS for rmdir (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for mkdir_p (1): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -1960,20 +2391,31 @@ static int test_rmdir_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestLastFail for rmdir (1) */
+  /* TestOutputTrue for mkdir_p (1) */
   {
     int r;
-    suppress_error = 1;
-    r = guestfs_rmdir (g, "/new");
-    if (r != -1)
+    suppress_error = 0;
+    r = guestfs_mkdir_p (g, "/new/foo/bar");
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_is_dir (g, "/new/foo");
+    if (r == -1)
+      return -1;
+    if (!r) {
+      fprintf (stderr, "test_mkdir_p_1: expected true, got false\n");
       return -1;
+    }
   }
   return 0;
 }
 
-static int test_rmdir_2 (void)
+static int test_mkdir_p_2 (void)
 {
-  /* InitBasicFS for rmdir (2): create ext2 on /dev/sda1 */
+  /* InitBasicFS for mkdir_p (2): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -2013,27 +2455,31 @@ static int test_rmdir_2 (void)
     if (r == -1)
       return -1;
   }
-  /* TestLastFail for rmdir (2) */
+  /* TestOutputTrue for mkdir_p (2) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/new");
+    r = guestfs_mkdir_p (g, "/new/foo/bar");
     if (r == -1)
       return -1;
   }
   {
     int r;
-    suppress_error = 1;
-    r = guestfs_rmdir (g, "/new");
-    if (r != -1)
+    suppress_error = 0;
+    r = guestfs_is_dir (g, "/new");
+    if (r == -1)
+      return -1;
+    if (!r) {
+      fprintf (stderr, "test_mkdir_p_2: expected true, got false\n");
       return -1;
+    }
   }
   return 0;
 }
 
-static int test_rm_rf_0 (void)
+static int test_mkdir_0 (void)
 {
-  /* InitBasicFS for rm_rf (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for mkdir (0): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -2073,7 +2519,7 @@ static int test_rm_rf_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputFalse for rm_rf (0) */
+  /* TestOutputTrue for mkdir (0) */
   {
     int r;
     suppress_error = 0;
@@ -2084,41 +2530,73 @@ static int test_rm_rf_0 (void)
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mkdir (g, "/new/foo");
+    r = guestfs_is_dir (g, "/new");
     if (r == -1)
       return -1;
+    if (!r) {
+      fprintf (stderr, "test_mkdir_0: expected true, got false\n");
+      return -1;
+    }
   }
+  return 0;
+}
+
+static int test_mkdir_1 (void)
+{
+  /* InitBasicFS for mkdir (1): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/new/foo/bar");
+    r = guestfs_umount_all (g);
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_rm_rf (g, "/new");
+    r = guestfs_lvm_remove_all (g);
     if (r == -1)
       return -1;
   }
   {
+    char *lines[] = {
+      ",",
+      NULL
+    };
     int r;
     suppress_error = 0;
-    r = guestfs_exists (g, "/new");
+    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
     if (r == -1)
       return -1;
-    if (r) {
-      fprintf (stderr, "test_rm_rf_0: expected false, got true\n");
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, "/dev/sda1", "/");
+    if (r == -1)
+      return -1;
+  }
+  /* TestLastFail for mkdir (1) */
+  {
+    int r;
+    suppress_error = 1;
+    r = guestfs_mkdir (g, "/new/foo/bar");
+    if (r != -1)
       return -1;
-    }
   }
   return 0;
 }
 
-static int test_mkdir_0 (void)
+static int test_rm_rf_0 (void)
 {
-  /* InitBasicFS for mkdir (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for rm_rf (0): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -2158,7 +2636,7 @@ static int test_mkdir_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputTrue for mkdir (0) */
+  /* TestOutputFalse for rm_rf (0) */
   {
     int r;
     suppress_error = 0;
@@ -2169,20 +2647,41 @@ static int test_mkdir_0 (void)
   {
     int r;
     suppress_error = 0;
-    r = guestfs_is_dir (g, "/new");
+    r = guestfs_mkdir (g, "/new/foo");
     if (r == -1)
       return -1;
-    if (!r) {
-      fprintf (stderr, "test_mkdir_0: expected true, got false\n");
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_touch (g, "/new/foo/bar");
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_rm_rf (g, "/new");
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_exists (g, "/new");
+    if (r == -1)
+      return -1;
+    if (r) {
+      fprintf (stderr, "test_rm_rf_0: expected false, got true\n");
       return -1;
     }
   }
   return 0;
 }
 
-static int test_mkdir_1 (void)
+static int test_rmdir_0 (void)
 {
-  /* InitBasicFS for mkdir (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for rmdir (0): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -2222,20 +2721,27 @@ static int test_mkdir_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestLastFail for mkdir (1) */
+  /* TestRun for rmdir (0) */
   {
     int r;
-    suppress_error = 1;
-    r = guestfs_mkdir (g, "/new/foo/bar");
-    if (r != -1)
+    suppress_error = 0;
+    r = guestfs_mkdir (g, "/new");
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_rmdir (g, "/new");
+    if (r == -1)
       return -1;
   }
   return 0;
 }
 
-static int test_mkdir_p_0 (void)
+static int test_rmdir_1 (void)
 {
-  /* InitBasicFS for mkdir_p (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for rmdir (1): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -2275,31 +2781,20 @@ static int test_mkdir_p_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputTrue for mkdir_p (0) */
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_mkdir_p (g, "/new/foo/bar");
-    if (r == -1)
-      return -1;
-  }
+  /* TestLastFail for rmdir (1) */
   {
     int r;
-    suppress_error = 0;
-    r = guestfs_is_dir (g, "/new/foo/bar");
-    if (r == -1)
-      return -1;
-    if (!r) {
-      fprintf (stderr, "test_mkdir_p_0: expected true, got false\n");
+    suppress_error = 1;
+    r = guestfs_rmdir (g, "/new");
+    if (r != -1)
       return -1;
-    }
   }
   return 0;
 }
 
-static int test_mkdir_p_1 (void)
+static int test_rmdir_2 (void)
 {
-  /* InitBasicFS for mkdir_p (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for rmdir (2): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -2339,31 +2834,27 @@ static int test_mkdir_p_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputTrue for mkdir_p (1) */
+  /* TestLastFail for rmdir (2) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mkdir_p (g, "/new/foo/bar");
+    r = guestfs_touch (g, "/new");
     if (r == -1)
       return -1;
   }
   {
     int r;
-    suppress_error = 0;
-    r = guestfs_is_dir (g, "/new/foo");
-    if (r == -1)
-      return -1;
-    if (!r) {
-      fprintf (stderr, "test_mkdir_p_1: expected true, got false\n");
+    suppress_error = 1;
+    r = guestfs_rmdir (g, "/new");
+    if (r != -1)
       return -1;
-    }
   }
   return 0;
 }
 
-static int test_mkdir_p_2 (void)
+static int test_rm_0 (void)
 {
-  /* InitBasicFS for mkdir_p (2): create ext2 on /dev/sda1 */
+  /* InitBasicFS for rm (0): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -2403,31 +2894,27 @@ static int test_mkdir_p_2 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputTrue for mkdir_p (2) */
+  /* TestRun for rm (0) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mkdir_p (g, "/new/foo/bar");
+    r = guestfs_touch (g, "/new");
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_is_dir (g, "/new");
+    r = guestfs_rm (g, "/new");
     if (r == -1)
       return -1;
-    if (!r) {
-      fprintf (stderr, "test_mkdir_p_2: expected true, got false\n");
-      return -1;
-    }
   }
   return 0;
 }
 
-static int test_exists_0 (void)
+static int test_rm_1 (void)
 {
-  /* InitBasicFS for exists (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for rm (1): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -2467,31 +2954,20 @@ static int test_exists_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputTrue for exists (0) */
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_touch (g, "/new");
-    if (r == -1)
-      return -1;
-  }
+  /* TestLastFail for rm (1) */
   {
     int r;
-    suppress_error = 0;
-    r = guestfs_exists (g, "/new");
-    if (r == -1)
-      return -1;
-    if (!r) {
-      fprintf (stderr, "test_exists_0: expected true, got false\n");
+    suppress_error = 1;
+    r = guestfs_rm (g, "/new");
+    if (r != -1)
       return -1;
-    }
   }
   return 0;
 }
 
-static int test_exists_1 (void)
+static int test_rm_2 (void)
 {
-  /* InitBasicFS for exists (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for rm (2): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -2531,7 +3007,7 @@ static int test_exists_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputTrue for exists (1) */
+  /* TestLastFail for rm (2) */
   {
     int r;
     suppress_error = 0;
@@ -2541,21 +3017,17 @@ static int test_exists_1 (void)
   }
   {
     int r;
-    suppress_error = 0;
-    r = guestfs_exists (g, "/new");
-    if (r == -1)
-      return -1;
-    if (!r) {
-      fprintf (stderr, "test_exists_1: expected true, got false\n");
+    suppress_error = 1;
+    r = guestfs_rm (g, "/new");
+    if (r != -1)
       return -1;
-    }
   }
   return 0;
 }
 
-static int test_is_file_0 (void)
+static int test_read_lines_0 (void)
 {
-  /* InitBasicFS for is_file (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for read_lines (0): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -2595,31 +3067,63 @@ static int test_is_file_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputTrue for is_file (0) */
+  /* TestOutputList for read_lines (0) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/new");
+    r = guestfs_write_file (g, "/new", "line1\r\nline2\nline3", 0);
     if (r == -1)
       return -1;
   }
   {
-    int r;
+    char **r;
+    int i;
     suppress_error = 0;
-    r = guestfs_is_file (g, "/new");
-    if (r == -1)
+    r = guestfs_read_lines (g, "/new");
+    if (r == NULL)
       return -1;
-    if (!r) {
-      fprintf (stderr, "test_is_file_0: expected true, got false\n");
+    if (!r[0]) {
+      fprintf (stderr, "test_read_lines_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[0], "line1") != 0) {
+      fprintf (stderr, "test_read_lines_0: expected \"line1\" but got \"%s\"\n", r[0]);
+      return -1;
+    }
+    if (!r[1]) {
+      fprintf (stderr, "test_read_lines_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[1], "line2") != 0) {
+      fprintf (stderr, "test_read_lines_0: expected \"line2\" but got \"%s\"\n", r[1]);
+      return -1;
+    }
+    if (!r[2]) {
+      fprintf (stderr, "test_read_lines_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[2], "line3") != 0) {
+      fprintf (stderr, "test_read_lines_0: expected \"line3\" but got \"%s\"\n", r[2]);
+      return -1;
+    }
+    if (r[3] != NULL) {
+      fprintf (stderr, "test_read_lines_0: extra elements returned from command\n");
+      print_strings (r);
       return -1;
     }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
+    free (r);
   }
   return 0;
 }
 
-static int test_is_file_1 (void)
+static int test_read_lines_1 (void)
 {
-  /* InitBasicFS for is_file (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for read_lines (1): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -2659,31 +3163,36 @@ static int test_is_file_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputFalse for is_file (1) */
+  /* TestOutputList for read_lines (1) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mkdir (g, "/new");
+    r = guestfs_write_file (g, "/new", "", 0);
     if (r == -1)
       return -1;
   }
   {
-    int r;
+    char **r;
+    int i;
     suppress_error = 0;
-    r = guestfs_is_file (g, "/new");
-    if (r == -1)
+    r = guestfs_read_lines (g, "/new");
+    if (r == NULL)
       return -1;
-    if (r) {
-      fprintf (stderr, "test_is_file_1: expected false, got true\n");
+    if (r[0] != NULL) {
+      fprintf (stderr, "test_read_lines_1: extra elements returned from command\n");
+      print_strings (r);
       return -1;
     }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
+    free (r);
   }
   return 0;
 }
 
-static int test_is_dir_0 (void)
+static int test_lvs_0 (void)
 {
-  /* InitBasicFS for is_dir (0): create ext2 on /dev/sda1 */
+  /* InitBasicFSonLVM for lvs (0): create ext2 on /dev/VG/LV */
   {
     int r;
     suppress_error = 0;
@@ -2712,42 +3221,74 @@ static int test_is_dir_0 (void)
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_pvcreate (g, "/dev/sda1");
     if (r == -1)
       return -1;
   }
   {
+    char *physvols[] = {
+      "/dev/sda1",
+      NULL
+    };
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_vgcreate (g, "VG", physvols);
     if (r == -1)
       return -1;
   }
-  /* TestOutputFalse for is_dir (0) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/new");
+    r = guestfs_lvcreate (g, "LV", "VG", 8);
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_is_dir (g, "/new");
+    r = guestfs_mkfs (g, "ext2", "/dev/VG/LV");
     if (r == -1)
       return -1;
-    if (r) {
-      fprintf (stderr, "test_is_dir_0: expected false, got true\n");
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, "/dev/VG/LV", "/");
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputList for lvs (0) */
+  {
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_lvs (g);
+    if (r == NULL)
+      return -1;
+    if (!r[0]) {
+      fprintf (stderr, "test_lvs_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[0], "/dev/VG/LV") != 0) {
+      fprintf (stderr, "test_lvs_0: expected \"/dev/VG/LV\" but got \"%s\"\n", r[0]);
+      return -1;
+    }
+    if (r[1] != NULL) {
+      fprintf (stderr, "test_lvs_0: extra elements returned from command\n");
+      print_strings (r);
       return -1;
     }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
+    free (r);
   }
   return 0;
 }
 
-static int test_is_dir_1 (void)
+static int test_lvs_1 (void)
 {
-  /* InitBasicFS for is_dir (1): create ext2 on /dev/sda1 */
+  /* InitEmpty for lvs (1) */
   {
     int r;
     suppress_error = 0;
@@ -2762,8 +3303,11 @@ static int test_is_dir_1 (void)
     if (r == -1)
       return -1;
   }
+  /* TestOutputList for lvs (1) */
   {
     char *lines[] = {
+      ",10",
+      ",20",
       ",",
       NULL
     };
@@ -2776,88 +3320,65 @@ static int test_is_dir_1 (void)
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
-    if (r == -1)
-      return -1;
-  }
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
-    if (r == -1)
-      return -1;
-  }
-  /* TestOutputTrue for is_dir (1) */
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_mkdir (g, "/new");
+    r = guestfs_pvcreate (g, "/dev/sda1");
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_is_dir (g, "/new");
+    r = guestfs_pvcreate (g, "/dev/sda2");
     if (r == -1)
       return -1;
-    if (!r) {
-      fprintf (stderr, "test_is_dir_1: expected true, got false\n");
-      return -1;
-    }
   }
-  return 0;
-}
-
-static int test_pvcreate_0 (void)
-{
-  /* InitEmpty for pvcreate (0) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_umount_all (g);
+    r = guestfs_pvcreate (g, "/dev/sda3");
     if (r == -1)
       return -1;
   }
   {
+    char *physvols[] = {
+      "/dev/sda1",
+      "/dev/sda2",
+      NULL
+    };
     int r;
     suppress_error = 0;
-    r = guestfs_lvm_remove_all (g);
+    r = guestfs_vgcreate (g, "VG1", physvols);
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for pvcreate (0) */
   {
-    char *lines[] = {
-      ",10",
-      ",20",
-      ",",
+    char *physvols[] = {
+      "/dev/sda3",
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_vgcreate (g, "VG2", physvols);
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda1");
+    r = guestfs_lvcreate (g, "LV1", "VG1", 50);
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda2");
+    r = guestfs_lvcreate (g, "LV2", "VG1", 50);
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda3");
+    r = guestfs_lvcreate (g, "LV3", "VG2", 50);
     if (r == -1)
       return -1;
   }
@@ -2865,38 +3386,38 @@ static int test_pvcreate_0 (void)
     char **r;
     int i;
     suppress_error = 0;
-    r = guestfs_pvs (g);
+    r = guestfs_lvs (g);
     if (r == NULL)
       return -1;
     if (!r[0]) {
-      fprintf (stderr, "test_pvcreate_0: short list returned from command\n");
+      fprintf (stderr, "test_lvs_1: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[0], "/dev/sda1") != 0) {
-      fprintf (stderr, "test_pvcreate_0: expected \"/dev/sda1\" but got \"%s\"\n", r[0]);
+    if (strcmp (r[0], "/dev/VG1/LV1") != 0) {
+      fprintf (stderr, "test_lvs_1: expected \"/dev/VG1/LV1\" but got \"%s\"\n", r[0]);
       return -1;
     }
     if (!r[1]) {
-      fprintf (stderr, "test_pvcreate_0: short list returned from command\n");
+      fprintf (stderr, "test_lvs_1: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[1], "/dev/sda2") != 0) {
-      fprintf (stderr, "test_pvcreate_0: expected \"/dev/sda2\" but got \"%s\"\n", r[1]);
+    if (strcmp (r[1], "/dev/VG1/LV2") != 0) {
+      fprintf (stderr, "test_lvs_1: expected \"/dev/VG1/LV2\" but got \"%s\"\n", r[1]);
       return -1;
     }
     if (!r[2]) {
-      fprintf (stderr, "test_pvcreate_0: short list returned from command\n");
+      fprintf (stderr, "test_lvs_1: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[2], "/dev/sda3") != 0) {
-      fprintf (stderr, "test_pvcreate_0: expected \"/dev/sda3\" but got \"%s\"\n", r[2]);
+    if (strcmp (r[2], "/dev/VG2/LV3") != 0) {
+      fprintf (stderr, "test_lvs_1: expected \"/dev/VG2/LV3\" but got \"%s\"\n", r[2]);
       return -1;
     }
     if (r[3] != NULL) {
-      fprintf (stderr, "test_pvcreate_0: extra elements returned from command\n");
+      fprintf (stderr, "test_lvs_1: extra elements returned from command\n");
       print_strings (r);
       return -1;
     }
@@ -2907,9 +3428,9 @@ static int test_pvcreate_0 (void)
   return 0;
 }
 
-static int test_vgcreate_0 (void)
+static int test_vgs_0 (void)
 {
-  /* InitEmpty for vgcreate (0) */
+  /* InitBasicFSonLVM for vgs (0): create ext2 on /dev/VG/LV */
   {
     int r;
     suppress_error = 0;
@@ -2924,11 +3445,8 @@ static int test_vgcreate_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for vgcreate (0) */
   {
     char *lines[] = {
-      ",10",
-      ",20",
       ",",
       NULL
     };
@@ -2946,42 +3464,38 @@ static int test_vgcreate_0 (void)
       return -1;
   }
   {
+    char *physvols[] = {
+      "/dev/sda1",
+      NULL
+    };
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda2");
+    r = guestfs_vgcreate (g, "VG", physvols);
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda3");
+    r = guestfs_lvcreate (g, "LV", "VG", 8);
     if (r == -1)
       return -1;
   }
   {
-    char *physvols[] = {
-      "/dev/sda1",
-      "/dev/sda2",
-      NULL
-    };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG1", physvols);
+    r = guestfs_mkfs (g, "ext2", "/dev/VG/LV");
     if (r == -1)
       return -1;
   }
   {
-    char *physvols[] = {
-      "/dev/sda3",
-      NULL
-    };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG2", physvols);
+    r = guestfs_mount (g, "/dev/VG/LV", "/");
     if (r == -1)
       return -1;
   }
+  /* TestOutputList for vgs (0) */
   {
     char **r;
     int i;
@@ -2990,25 +3504,16 @@ static int test_vgcreate_0 (void)
     if (r == NULL)
       return -1;
     if (!r[0]) {
-      fprintf (stderr, "test_vgcreate_0: short list returned from command\n");
-      print_strings (r);
-      return -1;
-    }
-    if (strcmp (r[0], "VG1") != 0) {
-      fprintf (stderr, "test_vgcreate_0: expected \"VG1\" but got \"%s\"\n", r[0]);
-      return -1;
-    }
-    if (!r[1]) {
-      fprintf (stderr, "test_vgcreate_0: short list returned from command\n");
+      fprintf (stderr, "test_vgs_0: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[1], "VG2") != 0) {
-      fprintf (stderr, "test_vgcreate_0: expected \"VG2\" but got \"%s\"\n", r[1]);
+    if (strcmp (r[0], "VG") != 0) {
+      fprintf (stderr, "test_vgs_0: expected \"VG\" but got \"%s\"\n", r[0]);
       return -1;
     }
-    if (r[2] != NULL) {
-      fprintf (stderr, "test_vgcreate_0: extra elements returned from command\n");
+    if (r[1] != NULL) {
+      fprintf (stderr, "test_vgs_0: extra elements returned from command\n");
       print_strings (r);
       return -1;
     }
@@ -3019,9 +3524,9 @@ static int test_vgcreate_0 (void)
   return 0;
 }
 
-static int test_lvcreate_0 (void)
+static int test_vgs_1 (void)
 {
-  /* InitEmpty for lvcreate (0) */
+  /* InitEmpty for vgs (1) */
   {
     int r;
     suppress_error = 0;
@@ -3036,7 +3541,7 @@ static int test_lvcreate_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for lvcreate (0) */
+  /* TestOutputList for vgs (1) */
   {
     char *lines[] = {
       ",10",
@@ -3095,94 +3600,32 @@ static int test_lvcreate_0 (void)
       return -1;
   }
   {
-    int r;
-    suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV1", "VG1", 50);
-    if (r == -1)
-      return -1;
-  }
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV2", "VG1", 50);
-    if (r == -1)
-      return -1;
-  }
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV3", "VG2", 50);
-    if (r == -1)
-      return -1;
-  }
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV4", "VG2", 50);
-    if (r == -1)
-      return -1;
-  }
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV5", "VG2", 50);
-    if (r == -1)
-      return -1;
-  }
-  {
     char **r;
     int i;
     suppress_error = 0;
-    r = guestfs_lvs (g);
+    r = guestfs_vgs (g);
     if (r == NULL)
       return -1;
     if (!r[0]) {
-      fprintf (stderr, "test_lvcreate_0: short list returned from command\n");
+      fprintf (stderr, "test_vgs_1: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[0], "/dev/VG1/LV1") != 0) {
-      fprintf (stderr, "test_lvcreate_0: expected \"/dev/VG1/LV1\" but got \"%s\"\n", r[0]);
+    if (strcmp (r[0], "VG1") != 0) {
+      fprintf (stderr, "test_vgs_1: expected \"VG1\" but got \"%s\"\n", r[0]);
       return -1;
     }
     if (!r[1]) {
-      fprintf (stderr, "test_lvcreate_0: short list returned from command\n");
-      print_strings (r);
-      return -1;
-    }
-    if (strcmp (r[1], "/dev/VG1/LV2") != 0) {
-      fprintf (stderr, "test_lvcreate_0: expected \"/dev/VG1/LV2\" but got \"%s\"\n", r[1]);
-      return -1;
-    }
-    if (!r[2]) {
-      fprintf (stderr, "test_lvcreate_0: short list returned from command\n");
-      print_strings (r);
-      return -1;
-    }
-    if (strcmp (r[2], "/dev/VG2/LV3") != 0) {
-      fprintf (stderr, "test_lvcreate_0: expected \"/dev/VG2/LV3\" but got \"%s\"\n", r[2]);
-      return -1;
-    }
-    if (!r[3]) {
-      fprintf (stderr, "test_lvcreate_0: short list returned from command\n");
-      print_strings (r);
-      return -1;
-    }
-    if (strcmp (r[3], "/dev/VG2/LV4") != 0) {
-      fprintf (stderr, "test_lvcreate_0: expected \"/dev/VG2/LV4\" but got \"%s\"\n", r[3]);
-      return -1;
-    }
-    if (!r[4]) {
-      fprintf (stderr, "test_lvcreate_0: short list returned from command\n");
+      fprintf (stderr, "test_vgs_1: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[4], "/dev/VG2/LV5") != 0) {
-      fprintf (stderr, "test_lvcreate_0: expected \"/dev/VG2/LV5\" but got \"%s\"\n", r[4]);
+    if (strcmp (r[1], "VG2") != 0) {
+      fprintf (stderr, "test_vgs_1: expected \"VG2\" but got \"%s\"\n", r[1]);
       return -1;
     }
-    if (r[5] != NULL) {
-      fprintf (stderr, "test_lvcreate_0: extra elements returned from command\n");
+    if (r[2] != NULL) {
+      fprintf (stderr, "test_vgs_1: extra elements returned from command\n");
       print_strings (r);
       return -1;
     }
@@ -3193,9 +3636,9 @@ static int test_lvcreate_0 (void)
   return 0;
 }
 
-static int test_mkfs_0 (void)
+static int test_pvs_0 (void)
 {
-  /* InitEmpty for mkfs (0) */
+  /* InitBasicFSonLVM for pvs (0): create ext2 on /dev/VG/LV */
   {
     int r;
     suppress_error = 0;
@@ -3210,7 +3653,6 @@ static int test_mkfs_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutput for mkfs (0) */
   {
     char *lines[] = {
       ",",
@@ -3225,107 +3667,74 @@ static int test_mkfs_0 (void)
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
-    if (r == -1)
-      return -1;
-  }
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
-    if (r == -1)
-      return -1;
-  }
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "new file contents", 0);
-    if (r == -1)
-      return -1;
-  }
-  {
-    char *r;
-    suppress_error = 0;
-    r = guestfs_cat (g, "/new");
-    if (r == NULL)
-      return -1;
-    if (strcmp (r, "new file contents") != 0) {
-      fprintf (stderr, "test_mkfs_0: expected \"new file contents\" but got \"%s\"\n", r);
-      return -1;
-    }
-    free (r);
-  }
-  return 0;
-}
-
-static int test_write_file_0 (void)
-{
-  /* InitEmpty for write_file (0) */
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_umount_all (g);
-    if (r == -1)
-      return -1;
-  }
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_lvm_remove_all (g);
+    r = guestfs_pvcreate (g, "/dev/sda1");
     if (r == -1)
       return -1;
   }
-  /* TestOutput for write_file (0) */
   {
-    char *lines[] = {
-      ",",
+    char *physvols[] = {
+      "/dev/sda1",
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_vgcreate (g, "VG", physvols);
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_lvcreate (g, "LV", "VG", 8);
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mkfs (g, "ext2", "/dev/VG/LV");
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "new file contents", 0);
+    r = guestfs_mount (g, "/dev/VG/LV", "/");
     if (r == -1)
       return -1;
   }
+  /* TestOutputList for pvs (0) */
   {
-    char *r;
+    char **r;
+    int i;
     suppress_error = 0;
-    r = guestfs_cat (g, "/new");
+    r = guestfs_pvs (g);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "new file contents") != 0) {
-      fprintf (stderr, "test_write_file_0: expected \"new file contents\" but got \"%s\"\n", r);
+    if (!r[0]) {
+      fprintf (stderr, "test_pvs_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[0], "/dev/sda1") != 0) {
+      fprintf (stderr, "test_pvs_0: expected \"/dev/sda1\" but got \"%s\"\n", r[0]);
+      return -1;
+    }
+    if (r[1] != NULL) {
+      fprintf (stderr, "test_pvs_0: extra elements returned from command\n");
+      print_strings (r);
       return -1;
     }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
     free (r);
   }
   return 0;
 }
 
-static int test_umount_0 (void)
+static int test_pvs_1 (void)
 {
-  /* InitEmpty for umount (0) */
+  /* InitEmpty for pvs (1) */
   {
     int r;
     suppress_error = 0;
@@ -3340,9 +3749,11 @@ static int test_umount_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for umount (0) */
+  /* TestOutputList for pvs (1) */
   {
     char *lines[] = {
+      ",10",
+      ",20",
       ",",
       NULL
     };
@@ -3355,14 +3766,21 @@ static int test_umount_0 (void)
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_pvcreate (g, "/dev/sda1");
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_pvcreate (g, "/dev/sda2");
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_pvcreate (g, "/dev/sda3");
     if (r == -1)
       return -1;
   }
@@ -3370,20 +3788,38 @@ static int test_umount_0 (void)
     char **r;
     int i;
     suppress_error = 0;
-    r = guestfs_mounts (g);
+    r = guestfs_pvs (g);
     if (r == NULL)
       return -1;
     if (!r[0]) {
-      fprintf (stderr, "test_umount_0: short list returned from command\n");
+      fprintf (stderr, "test_pvs_1: short list returned from command\n");
       print_strings (r);
       return -1;
     }
     if (strcmp (r[0], "/dev/sda1") != 0) {
-      fprintf (stderr, "test_umount_0: expected \"/dev/sda1\" but got \"%s\"\n", r[0]);
+      fprintf (stderr, "test_pvs_1: expected \"/dev/sda1\" but got \"%s\"\n", r[0]);
       return -1;
     }
-    if (r[1] != NULL) {
-      fprintf (stderr, "test_umount_0: extra elements returned from command\n");
+    if (!r[1]) {
+      fprintf (stderr, "test_pvs_1: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[1], "/dev/sda2") != 0) {
+      fprintf (stderr, "test_pvs_1: expected \"/dev/sda2\" but got \"%s\"\n", r[1]);
+      return -1;
+    }
+    if (!r[2]) {
+      fprintf (stderr, "test_pvs_1: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[2], "/dev/sda3") != 0) {
+      fprintf (stderr, "test_pvs_1: expected \"/dev/sda3\" but got \"%s\"\n", r[2]);
+      return -1;
+    }
+    if (r[3] != NULL) {
+      fprintf (stderr, "test_pvs_1: extra elements returned from command\n");
       print_strings (r);
       return -1;
     }
@@ -3394,9 +3830,9 @@ static int test_umount_0 (void)
   return 0;
 }
 
-static int test_umount_1 (void)
+static int test_list_partitions_0 (void)
 {
-  /* InitEmpty for umount (1) */
+  /* InitBasicFS for list_partitions (0): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -3411,7 +3847,6 @@ static int test_umount_1 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for umount (1) */
   {
     char *lines[] = {
       ",",
@@ -3437,22 +3872,25 @@ static int test_umount_1 (void)
     if (r == -1)
       return -1;
   }
-  {
-    int r;
-    suppress_error = 0;
-    r = guestfs_umount (g, "/");
-    if (r == -1)
-      return -1;
-  }
+  /* TestOutputList for list_partitions (0) */
   {
     char **r;
     int i;
     suppress_error = 0;
-    r = guestfs_mounts (g);
+    r = guestfs_list_partitions (g);
     if (r == NULL)
       return -1;
-    if (r[0] != NULL) {
-      fprintf (stderr, "test_umount_1: extra elements returned from command\n");
+    if (!r[0]) {
+      fprintf (stderr, "test_list_partitions_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[0], "/dev/sda1") != 0) {
+      fprintf (stderr, "test_list_partitions_0: expected \"/dev/sda1\" but got \"%s\"\n", r[0]);
+      return -1;
+    }
+    if (r[1] != NULL) {
+      fprintf (stderr, "test_list_partitions_0: extra elements returned from command\n");
       print_strings (r);
       return -1;
     }
@@ -3463,9 +3901,9 @@ static int test_umount_1 (void)
   return 0;
 }
 
-static int test_mounts_0 (void)
+static int test_list_partitions_1 (void)
 {
-  /* InitBasicFS for mounts (0): create ext2 on /dev/sda1 */
+  /* InitEmpty for list_partitions (1) */
   {
     int r;
     suppress_error = 0;
@@ -3480,8 +3918,11 @@ static int test_mounts_0 (void)
     if (r == -1)
       return -1;
   }
+  /* TestOutputList for list_partitions (1) */
   {
     char *lines[] = {
+      ",10",
+      ",20",
       ",",
       NULL
     };
@@ -3492,38 +3933,105 @@ static int test_mounts_0 (void)
       return -1;
   }
   {
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_list_partitions (g);
+    if (r == NULL)
+      return -1;
+    if (!r[0]) {
+      fprintf (stderr, "test_list_partitions_1: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[0], "/dev/sda1") != 0) {
+      fprintf (stderr, "test_list_partitions_1: expected \"/dev/sda1\" but got \"%s\"\n", r[0]);
+      return -1;
+    }
+    if (!r[1]) {
+      fprintf (stderr, "test_list_partitions_1: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[1], "/dev/sda2") != 0) {
+      fprintf (stderr, "test_list_partitions_1: expected \"/dev/sda2\" but got \"%s\"\n", r[1]);
+      return -1;
+    }
+    if (!r[2]) {
+      fprintf (stderr, "test_list_partitions_1: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[2], "/dev/sda3") != 0) {
+      fprintf (stderr, "test_list_partitions_1: expected \"/dev/sda3\" but got \"%s\"\n", r[2]);
+      return -1;
+    }
+    if (r[3] != NULL) {
+      fprintf (stderr, "test_list_partitions_1: extra elements returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
+    free (r);
+  }
+  return 0;
+}
+
+static int test_list_devices_0 (void)
+{
+  /* InitEmpty for list_devices (0) */
+  {
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_umount_all (g);
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_lvm_remove_all (g);
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for mounts (0) */
+  /* TestOutputList for list_devices (0) */
   {
     char **r;
     int i;
     suppress_error = 0;
-    r = guestfs_mounts (g);
+    r = guestfs_list_devices (g);
     if (r == NULL)
       return -1;
     if (!r[0]) {
-      fprintf (stderr, "test_mounts_0: short list returned from command\n");
+      fprintf (stderr, "test_list_devices_0: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[0], "/dev/sda1") != 0) {
-      fprintf (stderr, "test_mounts_0: expected \"/dev/sda1\" but got \"%s\"\n", r[0]);
+    if (strcmp (r[0], "/dev/sda") != 0) {
+      fprintf (stderr, "test_list_devices_0: expected \"/dev/sda\" but got \"%s\"\n", r[0]);
       return -1;
     }
-    if (r[1] != NULL) {
-      fprintf (stderr, "test_mounts_0: extra elements returned from command\n");
+    if (!r[1]) {
+      fprintf (stderr, "test_list_devices_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[1], "/dev/sdb") != 0) {
+      fprintf (stderr, "test_list_devices_0: expected \"/dev/sdb\" but got \"%s\"\n", r[1]);
+      return -1;
+    }
+    if (!r[2]) {
+      fprintf (stderr, "test_list_devices_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[2], "/dev/sdc") != 0) {
+      fprintf (stderr, "test_list_devices_0: expected \"/dev/sdc\" but got \"%s\"\n", r[2]);
+      return -1;
+    }
+    if (r[3] != NULL) {
+      fprintf (stderr, "test_list_devices_0: extra elements returned from command\n");
       print_strings (r);
       return -1;
     }
@@ -3534,9 +4042,9 @@ static int test_mounts_0 (void)
   return 0;
 }
 
-static int test_umount_all_0 (void)
+static int test_ls_0 (void)
 {
-  /* InitBasicFS for umount_all (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for ls (0): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -3576,11 +4084,25 @@ static int test_umount_all_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for umount_all (0) */
+  /* TestOutputList for ls (0) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_umount_all (g);
+    r = guestfs_touch (g, "/new");
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_touch (g, "/newer");
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_touch (g, "/newest");
     if (r == -1)
       return -1;
   }
@@ -3588,11 +4110,47 @@ static int test_umount_all_0 (void)
     char **r;
     int i;
     suppress_error = 0;
-    r = guestfs_mounts (g);
+    r = guestfs_ls (g, "/");
     if (r == NULL)
       return -1;
-    if (r[0] != NULL) {
-      fprintf (stderr, "test_umount_all_0: extra elements returned from command\n");
+    if (!r[0]) {
+      fprintf (stderr, "test_ls_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[0], "lost+found") != 0) {
+      fprintf (stderr, "test_ls_0: expected \"lost+found\" but got \"%s\"\n", r[0]);
+      return -1;
+    }
+    if (!r[1]) {
+      fprintf (stderr, "test_ls_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[1], "new") != 0) {
+      fprintf (stderr, "test_ls_0: expected \"new\" but got \"%s\"\n", r[1]);
+      return -1;
+    }
+    if (!r[2]) {
+      fprintf (stderr, "test_ls_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[2], "newer") != 0) {
+      fprintf (stderr, "test_ls_0: expected \"newer\" but got \"%s\"\n", r[2]);
+      return -1;
+    }
+    if (!r[3]) {
+      fprintf (stderr, "test_ls_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    if (strcmp (r[3], "newest") != 0) {
+      fprintf (stderr, "test_ls_0: expected \"newest\" but got \"%s\"\n", r[3]);
+      return -1;
+    }
+    if (r[4] != NULL) {
+      fprintf (stderr, "test_ls_0: extra elements returned from command\n");
       print_strings (r);
       return -1;
     }
@@ -3603,9 +4161,9 @@ static int test_umount_all_0 (void)
   return 0;
 }
 
-static int test_file_0 (void)
+static int test_cat_0 (void)
 {
-  /* InitBasicFS for file (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for cat (0): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -3645,22 +4203,22 @@ static int test_file_0 (void)
     if (r == -1)
       return -1;
   }
-  /* TestOutput for file (0) */
+  /* TestOutput for cat (0) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/new");
+    r = guestfs_write_file (g, "/new", "new file contents", 0);
     if (r == -1)
       return -1;
   }
   {
     char *r;
     suppress_error = 0;
-    r = guestfs_file (g, "/new");
+    r = guestfs_cat (g, "/new");
     if (r == NULL)
       return -1;
-    if (strcmp (r, "empty") != 0) {
-      fprintf (stderr, "test_file_0: expected \"empty\" but got \"%s\"\n", r);
+    if (strcmp (r, "new file contents") != 0) {
+      fprintf (stderr, "test_cat_0: expected \"new file contents\" but got \"%s\"\n", r);
       return -1;
     }
     free (r);
@@ -3668,9 +4226,9 @@ static int test_file_0 (void)
   return 0;
 }
 
-static int test_file_1 (void)
+static int test_touch_0 (void)
 {
-  /* InitBasicFS for file (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for touch (0): create ext2 on /dev/sda1 */
   {
     int r;
     suppress_error = 0;
@@ -3692,50 +4250,77 @@ static int test_file_1 (void)
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, "/dev/sda1", "/");
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputTrue for touch (0) */
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_touch (g, "/new");
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_exists (g, "/new");
     if (r == -1)
       return -1;
+    if (!r) {
+      fprintf (stderr, "test_touch_0: expected true, got false\n");
+      return -1;
+    }
   }
+  return 0;
+}
+
+static int test_sync_0 (void)
+{
+  /* InitEmpty for sync (0) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_umount_all (g);
     if (r == -1)
       return -1;
   }
-  /* TestOutput for file (1) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "some content\n", 0);
+    r = guestfs_lvm_remove_all (g);
     if (r == -1)
       return -1;
   }
+  /* TestRun for sync (0) */
   {
-    char *r;
+    int r;
     suppress_error = 0;
-    r = guestfs_file (g, "/new");
-    if (r == NULL)
-      return -1;
-    if (strcmp (r, "ASCII text") != 0) {
-      fprintf (stderr, "test_file_1: expected \"ASCII text\" but got \"%s\"\n", r);
+    r = guestfs_sync (g);
+    if (r == -1)
       return -1;
-    }
-    free (r);
   }
   return 0;
 }
 
-static int test_file_2 (void)
+static int test_mount_0 (void)
 {
-  /* InitBasicFS for file (2): create ext2 on /dev/sda1 */
+  /* InitEmpty for mount (0) */
   {
     int r;
     suppress_error = 0;
@@ -3750,6 +4335,7 @@ static int test_file_2 (void)
     if (r == -1)
       return -1;
   }
+  /* TestOutput for mount (0) */
   {
     char *lines[] = {
       ",",
@@ -3775,13 +4361,23 @@ static int test_file_2 (void)
     if (r == -1)
       return -1;
   }
-  /* TestLastFail for file (2) */
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, "/new", "new file contents", 0);
+    if (r == -1)
+      return -1;
+  }
   {
     char *r;
-    suppress_error = 1;
-    r = guestfs_file (g, "/nofile");
-    if (r != NULL)
+    suppress_error = 0;
+    r = guestfs_cat (g, "/new");
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, "new file contents") != 0) {
+      fprintf (stderr, "test_mount_0: expected \"new file contents\" but got \"%s\"\n", r);
       return -1;
+    }
     free (r);
   }
   return 0;
@@ -3794,6 +4390,9 @@ int main (int argc, char *argv[])
   const char *srcdir;
   int fd;
   char buf[256];
+  int nr_tests, test_num = 0;
+
+  no_test_warnings ();
 
   g = guestfs_create ();
   if (g == NULL) {
@@ -3900,249 +4499,384 @@ int main (int argc, char *argv[])
     exit (1);
   }
 
-  printf ("  1/ 49 test_mount_0\n");
-  if (test_mount_0 () == -1) {
-    printf ("test_mount_0 FAILED\n");
+  nr_tests = 63;
+
+  test_num++;
+  printf ("%3d/%3d test_blockdev_rereadpt_0\n", test_num, nr_tests);
+  if (test_blockdev_rereadpt_0 () == -1) {
+    printf ("test_blockdev_rereadpt_0 FAILED\n");
     failed++;
   }
-  printf ("  2/ 49 test_sync_0\n");
-  if (test_sync_0 () == -1) {
-    printf ("test_sync_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_blockdev_flushbufs_0\n", test_num, nr_tests);
+  if (test_blockdev_flushbufs_0 () == -1) {
+    printf ("test_blockdev_flushbufs_0 FAILED\n");
     failed++;
   }
-  printf ("  3/ 49 test_touch_0\n");
-  if (test_touch_0 () == -1) {
-    printf ("test_touch_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_blockdev_getsize64_0\n", test_num, nr_tests);
+  if (test_blockdev_getsize64_0 () == -1) {
+    printf ("test_blockdev_getsize64_0 FAILED\n");
     failed++;
   }
-  printf ("  4/ 49 test_cat_0\n");
-  if (test_cat_0 () == -1) {
-    printf ("test_cat_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_blockdev_getsz_0\n", test_num, nr_tests);
+  if (test_blockdev_getsz_0 () == -1) {
+    printf ("test_blockdev_getsz_0 FAILED\n");
     failed++;
   }
-  printf ("  5/ 49 test_ls_0\n");
-  if (test_ls_0 () == -1) {
-    printf ("test_ls_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_blockdev_getbsz_0\n", test_num, nr_tests);
+  if (test_blockdev_getbsz_0 () == -1) {
+    printf ("test_blockdev_getbsz_0 FAILED\n");
     failed++;
   }
-  printf ("  6/ 49 test_list_devices_0\n");
-  if (test_list_devices_0 () == -1) {
-    printf ("test_list_devices_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_blockdev_getss_0\n", test_num, nr_tests);
+  if (test_blockdev_getss_0 () == -1) {
+    printf ("test_blockdev_getss_0 FAILED\n");
     failed++;
   }
-  printf ("  7/ 49 test_list_partitions_0\n");
-  if (test_list_partitions_0 () == -1) {
-    printf ("test_list_partitions_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_blockdev_getro_0\n", test_num, nr_tests);
+  if (test_blockdev_getro_0 () == -1) {
+    printf ("test_blockdev_getro_0 FAILED\n");
     failed++;
   }
-  printf ("  8/ 49 test_list_partitions_1\n");
-  if (test_list_partitions_1 () == -1) {
-    printf ("test_list_partitions_1 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_blockdev_setrw_0\n", test_num, nr_tests);
+  if (test_blockdev_setrw_0 () == -1) {
+    printf ("test_blockdev_setrw_0 FAILED\n");
     failed++;
   }
-  printf ("  9/ 49 test_pvs_0\n");
-  if (test_pvs_0 () == -1) {
-    printf ("test_pvs_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_blockdev_setro_0\n", test_num, nr_tests);
+  if (test_blockdev_setro_0 () == -1) {
+    printf ("test_blockdev_setro_0 FAILED\n");
     failed++;
   }
-  printf (" 10/ 49 test_pvs_1\n");
-  if (test_pvs_1 () == -1) {
-    printf ("test_pvs_1 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_statvfs_0\n", test_num, nr_tests);
+  if (test_statvfs_0 () == -1) {
+    printf ("test_statvfs_0 FAILED\n");
     failed++;
   }
-  printf (" 11/ 49 test_vgs_0\n");
-  if (test_vgs_0 () == -1) {
-    printf ("test_vgs_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_lstat_0\n", test_num, nr_tests);
+  if (test_lstat_0 () == -1) {
+    printf ("test_lstat_0 FAILED\n");
     failed++;
   }
-  printf (" 12/ 49 test_vgs_1\n");
-  if (test_vgs_1 () == -1) {
-    printf ("test_vgs_1 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_stat_0\n", test_num, nr_tests);
+  if (test_stat_0 () == -1) {
+    printf ("test_stat_0 FAILED\n");
     failed++;
   }
-  printf (" 13/ 49 test_lvs_0\n");
-  if (test_lvs_0 () == -1) {
-    printf ("test_lvs_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_file_0\n", test_num, nr_tests);
+  if (test_file_0 () == -1) {
+    printf ("test_file_0 FAILED\n");
     failed++;
   }
-  printf (" 14/ 49 test_lvs_1\n");
-  if (test_lvs_1 () == -1) {
-    printf ("test_lvs_1 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_file_1\n", test_num, nr_tests);
+  if (test_file_1 () == -1) {
+    printf ("test_file_1 FAILED\n");
     failed++;
   }
-  printf (" 15/ 49 test_pvs_full_0\n");
-  if (test_pvs_full_0 () == -1) {
-    printf ("test_pvs_full_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_file_2\n", test_num, nr_tests);
+  if (test_file_2 () == -1) {
+    printf ("test_file_2 FAILED\n");
     failed++;
   }
-  printf (" 16/ 49 test_vgs_full_0\n");
-  if (test_vgs_full_0 () == -1) {
-    printf ("test_vgs_full_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_umount_all_0\n", test_num, nr_tests);
+  if (test_umount_all_0 () == -1) {
+    printf ("test_umount_all_0 FAILED\n");
     failed++;
   }
-  printf (" 17/ 49 test_lvs_full_0\n");
-  if (test_lvs_full_0 () == -1) {
-    printf ("test_lvs_full_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_mounts_0\n", test_num, nr_tests);
+  if (test_mounts_0 () == -1) {
+    printf ("test_mounts_0 FAILED\n");
     failed++;
   }
-  printf (" 18/ 49 test_read_lines_0\n");
-  if (test_read_lines_0 () == -1) {
-    printf ("test_read_lines_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_umount_0\n", test_num, nr_tests);
+  if (test_umount_0 () == -1) {
+    printf ("test_umount_0 FAILED\n");
     failed++;
   }
-  printf (" 19/ 49 test_read_lines_1\n");
-  if (test_read_lines_1 () == -1) {
-    printf ("test_read_lines_1 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_umount_1\n", test_num, nr_tests);
+  if (test_umount_1 () == -1) {
+    printf ("test_umount_1 FAILED\n");
     failed++;
   }
-  printf (" 20/ 49 test_rm_0\n");
-  if (test_rm_0 () == -1) {
-    printf ("test_rm_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_write_file_0\n", test_num, nr_tests);
+  if (test_write_file_0 () == -1) {
+    printf ("test_write_file_0 FAILED\n");
     failed++;
   }
-  printf (" 21/ 49 test_rm_1\n");
-  if (test_rm_1 () == -1) {
-    printf ("test_rm_1 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_write_file_1\n", test_num, nr_tests);
+  if (test_write_file_1 () == -1) {
+    printf ("test_write_file_1 FAILED\n");
     failed++;
   }
-  printf (" 22/ 49 test_rm_2\n");
-  if (test_rm_2 () == -1) {
-    printf ("test_rm_2 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_write_file_2\n", test_num, nr_tests);
+  if (test_write_file_2 () == -1) {
+    printf ("test_write_file_2 FAILED\n");
     failed++;
   }
-  printf (" 23/ 49 test_rmdir_0\n");
-  if (test_rmdir_0 () == -1) {
-    printf ("test_rmdir_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_write_file_3\n", test_num, nr_tests);
+  if (test_write_file_3 () == -1) {
+    printf ("test_write_file_3 FAILED\n");
     failed++;
   }
-  printf (" 24/ 49 test_rmdir_1\n");
-  if (test_rmdir_1 () == -1) {
-    printf ("test_rmdir_1 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_write_file_4\n", test_num, nr_tests);
+  if (test_write_file_4 () == -1) {
+    printf ("test_write_file_4 FAILED\n");
     failed++;
   }
-  printf (" 25/ 49 test_rmdir_2\n");
-  if (test_rmdir_2 () == -1) {
-    printf ("test_rmdir_2 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_write_file_5\n", test_num, nr_tests);
+  if (test_write_file_5 () == -1) {
+    printf ("test_write_file_5 FAILED\n");
     failed++;
   }
-  printf (" 26/ 49 test_rm_rf_0\n");
-  if (test_rm_rf_0 () == -1) {
-    printf ("test_rm_rf_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_mkfs_0\n", test_num, nr_tests);
+  if (test_mkfs_0 () == -1) {
+    printf ("test_mkfs_0 FAILED\n");
     failed++;
   }
-  printf (" 27/ 49 test_mkdir_0\n");
-  if (test_mkdir_0 () == -1) {
-    printf ("test_mkdir_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_lvcreate_0\n", test_num, nr_tests);
+  if (test_lvcreate_0 () == -1) {
+    printf ("test_lvcreate_0 FAILED\n");
     failed++;
   }
-  printf (" 28/ 49 test_mkdir_1\n");
-  if (test_mkdir_1 () == -1) {
-    printf ("test_mkdir_1 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_vgcreate_0\n", test_num, nr_tests);
+  if (test_vgcreate_0 () == -1) {
+    printf ("test_vgcreate_0 FAILED\n");
     failed++;
   }
-  printf (" 29/ 49 test_mkdir_p_0\n");
+  test_num++;
+  printf ("%3d/%3d test_pvcreate_0\n", test_num, nr_tests);
+  if (test_pvcreate_0 () == -1) {
+    printf ("test_pvcreate_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_is_dir_0\n", test_num, nr_tests);
+  if (test_is_dir_0 () == -1) {
+    printf ("test_is_dir_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_is_dir_1\n", test_num, nr_tests);
+  if (test_is_dir_1 () == -1) {
+    printf ("test_is_dir_1 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_is_file_0\n", test_num, nr_tests);
+  if (test_is_file_0 () == -1) {
+    printf ("test_is_file_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_is_file_1\n", test_num, nr_tests);
+  if (test_is_file_1 () == -1) {
+    printf ("test_is_file_1 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_exists_0\n", test_num, nr_tests);
+  if (test_exists_0 () == -1) {
+    printf ("test_exists_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_exists_1\n", test_num, nr_tests);
+  if (test_exists_1 () == -1) {
+    printf ("test_exists_1 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_mkdir_p_0\n", test_num, nr_tests);
   if (test_mkdir_p_0 () == -1) {
     printf ("test_mkdir_p_0 FAILED\n");
     failed++;
   }
-  printf (" 30/ 49 test_mkdir_p_1\n");
+  test_num++;
+  printf ("%3d/%3d test_mkdir_p_1\n", test_num, nr_tests);
   if (test_mkdir_p_1 () == -1) {
     printf ("test_mkdir_p_1 FAILED\n");
     failed++;
   }
-  printf (" 31/ 49 test_mkdir_p_2\n");
+  test_num++;
+  printf ("%3d/%3d test_mkdir_p_2\n", test_num, nr_tests);
   if (test_mkdir_p_2 () == -1) {
     printf ("test_mkdir_p_2 FAILED\n");
     failed++;
   }
-  printf (" 32/ 49 test_exists_0\n");
-  if (test_exists_0 () == -1) {
-    printf ("test_exists_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_mkdir_0\n", test_num, nr_tests);
+  if (test_mkdir_0 () == -1) {
+    printf ("test_mkdir_0 FAILED\n");
     failed++;
   }
-  printf (" 33/ 49 test_exists_1\n");
-  if (test_exists_1 () == -1) {
-    printf ("test_exists_1 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_mkdir_1\n", test_num, nr_tests);
+  if (test_mkdir_1 () == -1) {
+    printf ("test_mkdir_1 FAILED\n");
     failed++;
   }
-  printf (" 34/ 49 test_is_file_0\n");
-  if (test_is_file_0 () == -1) {
-    printf ("test_is_file_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_rm_rf_0\n", test_num, nr_tests);
+  if (test_rm_rf_0 () == -1) {
+    printf ("test_rm_rf_0 FAILED\n");
     failed++;
   }
-  printf (" 35/ 49 test_is_file_1\n");
-  if (test_is_file_1 () == -1) {
-    printf ("test_is_file_1 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_rmdir_0\n", test_num, nr_tests);
+  if (test_rmdir_0 () == -1) {
+    printf ("test_rmdir_0 FAILED\n");
     failed++;
   }
-  printf (" 36/ 49 test_is_dir_0\n");
-  if (test_is_dir_0 () == -1) {
-    printf ("test_is_dir_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_rmdir_1\n", test_num, nr_tests);
+  if (test_rmdir_1 () == -1) {
+    printf ("test_rmdir_1 FAILED\n");
     failed++;
   }
-  printf (" 37/ 49 test_is_dir_1\n");
-  if (test_is_dir_1 () == -1) {
-    printf ("test_is_dir_1 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_rmdir_2\n", test_num, nr_tests);
+  if (test_rmdir_2 () == -1) {
+    printf ("test_rmdir_2 FAILED\n");
     failed++;
   }
-  printf (" 38/ 49 test_pvcreate_0\n");
-  if (test_pvcreate_0 () == -1) {
-    printf ("test_pvcreate_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_rm_0\n", test_num, nr_tests);
+  if (test_rm_0 () == -1) {
+    printf ("test_rm_0 FAILED\n");
     failed++;
   }
-  printf (" 39/ 49 test_vgcreate_0\n");
-  if (test_vgcreate_0 () == -1) {
-    printf ("test_vgcreate_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_rm_1\n", test_num, nr_tests);
+  if (test_rm_1 () == -1) {
+    printf ("test_rm_1 FAILED\n");
     failed++;
   }
-  printf (" 40/ 49 test_lvcreate_0\n");
-  if (test_lvcreate_0 () == -1) {
-    printf ("test_lvcreate_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_rm_2\n", test_num, nr_tests);
+  if (test_rm_2 () == -1) {
+    printf ("test_rm_2 FAILED\n");
     failed++;
   }
-  printf (" 41/ 49 test_mkfs_0\n");
-  if (test_mkfs_0 () == -1) {
-    printf ("test_mkfs_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_read_lines_0\n", test_num, nr_tests);
+  if (test_read_lines_0 () == -1) {
+    printf ("test_read_lines_0 FAILED\n");
     failed++;
   }
-  printf (" 42/ 49 test_write_file_0\n");
-  if (test_write_file_0 () == -1) {
-    printf ("test_write_file_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_read_lines_1\n", test_num, nr_tests);
+  if (test_read_lines_1 () == -1) {
+    printf ("test_read_lines_1 FAILED\n");
     failed++;
   }
-  printf (" 43/ 49 test_umount_0\n");
-  if (test_umount_0 () == -1) {
-    printf ("test_umount_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_lvs_0\n", test_num, nr_tests);
+  if (test_lvs_0 () == -1) {
+    printf ("test_lvs_0 FAILED\n");
     failed++;
   }
-  printf (" 44/ 49 test_umount_1\n");
-  if (test_umount_1 () == -1) {
-    printf ("test_umount_1 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_lvs_1\n", test_num, nr_tests);
+  if (test_lvs_1 () == -1) {
+    printf ("test_lvs_1 FAILED\n");
     failed++;
   }
-  printf (" 45/ 49 test_mounts_0\n");
-  if (test_mounts_0 () == -1) {
-    printf ("test_mounts_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_vgs_0\n", test_num, nr_tests);
+  if (test_vgs_0 () == -1) {
+    printf ("test_vgs_0 FAILED\n");
     failed++;
   }
-  printf (" 46/ 49 test_umount_all_0\n");
-  if (test_umount_all_0 () == -1) {
-    printf ("test_umount_all_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_vgs_1\n", test_num, nr_tests);
+  if (test_vgs_1 () == -1) {
+    printf ("test_vgs_1 FAILED\n");
     failed++;
   }
-  printf (" 47/ 49 test_file_0\n");
-  if (test_file_0 () == -1) {
-    printf ("test_file_0 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_pvs_0\n", test_num, nr_tests);
+  if (test_pvs_0 () == -1) {
+    printf ("test_pvs_0 FAILED\n");
     failed++;
   }
-  printf (" 48/ 49 test_file_1\n");
-  if (test_file_1 () == -1) {
-    printf ("test_file_1 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_pvs_1\n", test_num, nr_tests);
+  if (test_pvs_1 () == -1) {
+    printf ("test_pvs_1 FAILED\n");
     failed++;
   }
-  printf (" 49/ 49 test_file_2\n");
-  if (test_file_2 () == -1) {
-    printf ("test_file_2 FAILED\n");
+  test_num++;
+  printf ("%3d/%3d test_list_partitions_0\n", test_num, nr_tests);
+  if (test_list_partitions_0 () == -1) {
+    printf ("test_list_partitions_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_list_partitions_1\n", test_num, nr_tests);
+  if (test_list_partitions_1 () == -1) {
+    printf ("test_list_partitions_1 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_list_devices_0\n", test_num, nr_tests);
+  if (test_list_devices_0 () == -1) {
+    printf ("test_list_devices_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_ls_0\n", test_num, nr_tests);
+  if (test_ls_0 () == -1) {
+    printf ("test_ls_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_cat_0\n", test_num, nr_tests);
+  if (test_cat_0 () == -1) {
+    printf ("test_cat_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_touch_0\n", test_num, nr_tests);
+  if (test_touch_0 () == -1) {
+    printf ("test_touch_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_sync_0\n", test_num, nr_tests);
+  if (test_sync_0 () == -1) {
+    printf ("test_sync_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_mount_0\n", test_num, nr_tests);
+  if (test_mount_0 () == -1) {
+    printf ("test_mount_0 FAILED\n");
     failed++;
   }
 
@@ -4155,7 +4889,7 @@ int main (int argc, char *argv[])
   unlink (buf);
 
   if (failed > 0) {
-    printf ("***** %d / 49 tests FAILED *****\n", failed);
+    printf ("***** %d / %d tests FAILED *****\n", failed, nr_tests);
     exit (1);
   }