From a24639d7d38bc4ffd5d242611ebe75be8cc1a482 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 30 Apr 2013 17:34:22 +0100
Subject: [PATCH] python: Standardize test numbering.

---
 python/t/{005-import.py => 010-load.py}       |  0
 python/t/{060-optargs.py => 070-optargs.py}   |  0
 python/t/{010-basic.py => 100-launch.py}      |  0
 python/t/410-close-event.py                   | 37 +++++++++++++++++++
 .../t/{400-events.py => 420-log-messages.py}  | 23 ++++--------
 python/t/{rhbz811650.py => 810-rhbz811650.py} |  0
 ...{028-python-dict.py => 900-python-dict.py} |  0
 7 files changed, 45 insertions(+), 15 deletions(-)
 rename python/t/{005-import.py => 010-load.py} (100%)
 rename python/t/{060-optargs.py => 070-optargs.py} (100%)
 rename python/t/{010-basic.py => 100-launch.py} (100%)
 create mode 100644 python/t/410-close-event.py
 rename python/t/{400-events.py => 420-log-messages.py} (76%)
 rename python/t/{rhbz811650.py => 810-rhbz811650.py} (100%)
 rename python/t/{028-python-dict.py => 900-python-dict.py} (100%)

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/410-close-event.py b/python/t/410-close-event.py
new file mode 100644
index 000000000..a0df5941e
--- /dev/null
+++ b/python/t/410-close-event.py
@@ -0,0 +1,37 @@
+# libguestfs Python bindings
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import os
+import guestfs
+
+g = guestfs.GuestFS (python_return_dict=True)
+
+close_invoked = 0
+
+def close_callback (ev, eh, buf, array):
+    global close_invoked
+    close_invoked += 1
+
+# Register a callback for the close event.
+g.set_event_callback (close_callback, guestfs.EVENT_CLOSE)
+
+# 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"
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 bc9eb1215..9d129ee60 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