[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, experimental, updated. debian/1%1.21.40-1

[Richard W.M. Jones]

The following commit has been merged in the experimental branch:
commit a24639d7d38bc4ffd5d242611ebe75be8cc1a482
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Apr 30 17:34:22 2013 +0100

    python: Standardize test numbering.

diff --git a/python/t/005-import.py b/python/t/010-load.py
similarity index 100%
rename from python/t/005-import.py
rename to python/t/010-load.py
diff --git a/python/t/060-optargs.py b/python/t/070-optargs.py
similarity index 100%
rename from python/t/060-optargs.py
rename to python/t/070-optargs.py
diff --git a/python/t/010-basic.py b/python/t/100-launch.py
similarity index 100%
rename from python/t/010-basic.py
rename to python/t/100-launch.py
diff --git a/python/t/400-events.py b/python/t/410-close-event.py
similarity index 65%
copy from python/t/400-events.py
copy to python/t/410-close-event.py
index bc9eb12..a0df594 100644
--- a/python/t/400-events.py
+++ b/python/t/410-close-event.py
@@ -1,5 +1,5 @@
 # libguestfs Python bindings
-# Copyright (C) 2011 Red Hat Inc.
+# Copyright (C) 2011-2013 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
@@ -20,36 +20,15 @@ import guestfs
 
 g = guestfs.GuestFS (python_return_dict=True)
 
-def log_callback (ev,eh,buf,array):
-    if ev == guestfs.EVENT_APPLIANCE:
-        buf = buf.rstrip()
-
-    # Log what happened.
-    print ("python event logged: event=%s eh=%d buf='%s' array=%s" %
-           (guestfs.event_to_string (ev), eh, buf, array))
-
 close_invoked = 0
 
 def close_callback (ev, eh, buf, array):
     global close_invoked
     close_invoked += 1
-    log_callback (ev, eh, buf, array)
-
-# Register an event callback for all log messages.
-events = guestfs.EVENT_APPLIANCE | guestfs.EVENT_LIBRARY | guestfs.EVENT_TRACE
-g.set_event_callback (log_callback, events)
 
 # Register a callback for the close event.
 g.set_event_callback (close_callback, guestfs.EVENT_CLOSE)
 
-# Now make sure we see some messages.
-g.set_trace (1)
-g.set_verbose (1)
-
-# Do some stuff.
-g.add_drive_ro ("/dev/null")
-g.set_autosync (1)
-
 # Close the handle.  The close callback should be invoked.
 if close_invoked != 0:
     raise "Error: close_invoked should be 0"
diff --git a/python/t/400-events.py b/python/t/420-log-messages.py
similarity index 76%
rename from python/t/400-events.py
rename to python/t/420-log-messages.py
index bc9eb12..9d129ee 100644
--- a/python/t/400-events.py
+++ b/python/t/420-log-messages.py
@@ -20,7 +20,12 @@ import guestfs
 
 g = guestfs.GuestFS (python_return_dict=True)
 
+log_invoked = 0
+
 def log_callback (ev,eh,buf,array):
+    global log_invoked
+    log_invoked += 1
+
     if ev == guestfs.EVENT_APPLIANCE:
         buf = buf.rstrip()
 
@@ -28,20 +33,10 @@ def log_callback (ev,eh,buf,array):
     print ("python event logged: event=%s eh=%d buf='%s' array=%s" %
            (guestfs.event_to_string (ev), eh, buf, array))
 
-close_invoked = 0
-
-def close_callback (ev, eh, buf, array):
-    global close_invoked
-    close_invoked += 1
-    log_callback (ev, eh, buf, array)
-
 # Register an event callback for all log messages.
 events = guestfs.EVENT_APPLIANCE | guestfs.EVENT_LIBRARY | guestfs.EVENT_TRACE
 g.set_event_callback (log_callback, events)
 
-# Register a callback for the close event.
-g.set_event_callback (close_callback, guestfs.EVENT_CLOSE)
-
 # Now make sure we see some messages.
 g.set_trace (1)
 g.set_verbose (1)
@@ -50,9 +45,7 @@ g.set_verbose (1)
 g.add_drive_ro ("/dev/null")
 g.set_autosync (1)
 
-# Close the handle.  The close callback should be invoked.
-if close_invoked != 0:
-    raise "Error: close_invoked should be 0"
 g.close ()
-if close_invoked != 1:
-    raise "Error: close_invoked should be 1"
+
+if log_invoked == 0:
+    raise "Error: log_invoked should be > 0"
diff --git a/python/t/rhbz811650.py b/python/t/810-rhbz811650.py
similarity index 100%
rename from python/t/rhbz811650.py
rename to python/t/810-rhbz811650.py
diff --git a/python/t/028-python-dict.py b/python/t/900-python-dict.py
similarity index 100%
rename from python/t/028-python-dict.py
rename to python/t/900-python-dict.py

-- 
Libguestfs Debian packaging