git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "blkid: Use -c /dev/null because RHEL 5 blkid doesn't have -p option."
[libguestfs.git]
/
ocaml
/
t
/
guestfs_400_progress.ml
diff --git
a/ocaml/t/guestfs_400_progress.ml
b/ocaml/t/guestfs_400_progress.ml
index
7227fac
..
d49ddff
100644
(file)
--- a/
ocaml/t/guestfs_400_progress.ml
+++ b/
ocaml/t/guestfs_400_progress.ml
@@
-1,5
+1,5
@@
(* libguestfs OCaml bindings
(* libguestfs OCaml bindings
- * Copyright (C) 2010 Red Hat Inc.
+ * Copyright (C) 2010
-2011
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
@@
-13,7
+13,7
@@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc.,
675 Mass Ave, Cambridge, MA 02139,
USA.
+ * Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
*)
module G = Guestfs
*)
module G = Guestfs
@@
-25,15
+25,15
@@
let () =
G.launch g;
let calls = ref 0 in
G.launch g;
let calls = ref 0 in
- let cb _ _ _ _ = incr calls in
- G.set_progress_callback g cb;
+ let cb _ _ _ _
_
= incr calls in
+ let eh = G.set_event_callback g cb [G.EVENT_PROGRESS] in
assert ("ok" = G.debug g "progress" [| "5" |]);
assert (!calls > 0);
calls := 0;
assert ("ok" = G.debug g "progress" [| "5" |]);
assert (!calls > 0);
calls := 0;
- G.
clear_progress_callback g
;
+ G.
delete_event_callback g eh
;
assert ("ok" = G.debug g "progress" [| "5" |]);
assert (!calls = 0);
assert ("ok" = G.debug g "progress" [| "5" |]);
assert (!calls = 0);
-
G.set_progress_callback g cb
;
+
ignore (G.set_event_callback g cb [G.EVENT_PROGRESS])
;
assert ("ok" = G.debug g "progress" [| "5" |]);
assert (!calls > 0);
assert ("ok" = G.debug g "progress" [| "5" |]);
assert (!calls > 0);