ocaml: Combine tests together to reduce number of launches.

[libguestfs.git] / ocaml / t / guestfs_010_basic.ml

diff --git a/ocaml/t/guestfs_060_readdir.ml b/ocaml/t/guestfs_010_basic.ml
similarity index 68%
rename from ocaml/t/guestfs_060_readdir.ml
rename to ocaml/t/guestfs_010_basic.ml
index f560700..6fa19e4 100644 (file)
--- a/ocaml/t/guestfs_060_readdir.ml
+++ b/ocaml/t/guestfs_010_basic.ml
@@ -1,5 +1,5 @@
 (* libguestfs OCaml bindings
 (* libguestfs OCaml bindings

- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009-2010 Red Hat Inc.

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -16,25 +16,37 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *)
 
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *)
 

+(* Test basic functionality. *)
+

 open Unix
 
 let () =
 open Unix
 
 let () =

-  let g = Guestfs.create () in
+  let g = new Guestfs.guestfs () in

 
   let fd = openfile "test.img" [O_WRONLY;O_CREAT;O_NOCTTY;O_TRUNC] 0o666 in
 
   let fd = openfile "test.img" [O_WRONLY;O_CREAT;O_NOCTTY;O_TRUNC] 0o666 in

-  ftruncate fd (10 * 1024 * 1024);
+  ftruncate fd (500 * 1024 * 1024);

   close fd;
 
   close fd;
 

-  Guestfs.add_drive g "test.img";
-  Guestfs.launch g;
+  g#set_autosync true;
+
+  g#add_drive "test.img";
+  g#launch ();
+
+  g#pvcreate "/dev/sda";
+  g#vgcreate "VG" [|"/dev/sda"|];
+  g#lvcreate "LV1" "VG" 200;
+  g#lvcreate "LV2" "VG" 200;
+
+  let lvs = g#lvs () in
+  if lvs <> [|"/dev/VG/LV1"; "/dev/VG/LV2"|] then
+    failwith "Guestfs.lvs returned incorrect result";

 
 

-  Guestfs.part_disk g "/dev/sda" "mbr";
-  Guestfs.mkfs g "ext2" "/dev/sda1";
-  Guestfs.mount g "/dev/sda1" "/";
-  Guestfs.mkdir g "/p";
-  Guestfs.touch g "/q";
+  g#mkfs "ext2" "/dev/VG/LV1";
+  g#mount_options "" "/dev/VG/LV1" "/";
+  g#mkdir "/p";
+  g#touch "/q";

 
 

-  let dirs = Guestfs.readdir g "/" in
+  let dirs = g#readdir "/" in

   let dirs = Array.to_list dirs in
   let cmp { Guestfs.name = n1 } { Guestfs.name = n2 } = compare n1 n2 in
   let dirs = List.sort cmp dirs in
   let dirs = Array.to_list dirs in
   let cmp { Guestfs.name = n1 } { Guestfs.name = n2 } = compare n1 n2 in
   let dirs = List.sort cmp dirs in


@@ -49,5 +61,5 @@ let () =
                "q", 'r' ] then
     failwith "Guestfs.readdir returned incorrect result";
 
                "q", 'r' ] then
     failwith "Guestfs.readdir returned incorrect result";
 

-  Guestfs.close g;
+  g#close ();

   unlink "test.img"
   unlink "test.img"