From b034795a259fb5f255c1f9c835d722efab4d4f7c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 30 Nov 2010 13:59:50 +0000
Subject: python: Combine tests to reduce number of launches.

---
 python/t/010-basic.py    | 36 ++++++++++++++++++++++++++++++++++++
 python/t/010-launch.py   | 28 ----------------------------
 python/t/050-lvcreate.py | 36 ------------------------------------
 3 files changed, 36 insertions(+), 64 deletions(-)
 create mode 100644 python/t/010-basic.py
 delete mode 100644 python/t/010-launch.py
 delete mode 100644 python/t/050-lvcreate.py

(limited to 'python')

diff --git a/python/t/010-basic.py b/python/t/010-basic.py
new file mode 100644
index 00000000..db2d9509
--- /dev/null
+++ b/python/t/010-basic.py
@@ -0,0 +1,36 @@
+# libguestfs Python bindings
+# 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
+# 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import os
+import guestfs
+
+g = guestfs.GuestFS()
+f = open ("test.img", "w")
+f.truncate (500 * 1024 * 1024)
+f.close ()
+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)
+if (g.lvs () != ["/dev/VG/LV1", "/dev/VG/LV2"]):
+    raise "Error: g.lvs() returned incorrect result"
+del g
+
+os.unlink ("test.img")
diff --git a/python/t/010-launch.py b/python/t/010-launch.py
deleted file mode 100644
index 93a8154a..00000000
--- a/python/t/010-launch.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# libguestfs Python bindings
-# Copyright (C) 2009 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-import os
-import guestfs
-
-g = guestfs.GuestFS()
-f = open ("test.img", "w")
-f.truncate (500 * 1024 * 1024)
-f.close ()
-g.add_drive ("test.img")
-g.launch ()
-
-os.unlink ("test.img")
diff --git a/python/t/050-lvcreate.py b/python/t/050-lvcreate.py
deleted file mode 100644
index f98fe29f..00000000
--- a/python/t/050-lvcreate.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# libguestfs Python bindings
-# Copyright (C) 2009 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-import os
-import guestfs
-
-g = guestfs.GuestFS()
-f = open ("test.img", "w")
-f.truncate (500 * 1024 * 1024)
-f.close ()
-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)
-if (g.lvs () != ["/dev/VG/LV1", "/dev/VG/LV2"]):
-    raise "Error: g.lvs() returned incorrect result"
-g.sync ()
-del g
-
-os.unlink ("test.img")
-- 
cgit