summaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2010-11-30 13:59:50 +0000
committerRichard W.M. Jones <rjones@redhat.com>2010-11-30 13:59:50 +0000
commitb034795a259fb5f255c1f9c835d722efab4d4f7c (patch)
tree05792ae3f742f71bee812cba9a5ef56615de78df /python
parent13af3835cdcfbf46c8072b7960d73ae9ca5deb4d (diff)
downloadlibguestfs-b034795a259fb5f255c1f9c835d722efab4d4f7c.tar.gz
libguestfs-b034795a259fb5f255c1f9c835d722efab4d4f7c.tar.xz
libguestfs-b034795a259fb5f255c1f9c835d722efab4d4f7c.zip
python: Combine tests to reduce number of launches.
Diffstat (limited to 'python')
-rw-r--r--python/t/010-basic.py (renamed from python/t/050-lvcreate.py)4
-rw-r--r--python/t/010-launch.py28
2 files changed, 2 insertions, 30 deletions
diff --git a/python/t/050-lvcreate.py b/python/t/010-basic.py
index f98fe29f..db2d9509 100644
--- a/python/t/050-lvcreate.py
+++ b/python/t/010-basic.py
@@ -1,5 +1,5 @@
# libguestfs Python 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
@@ -24,13 +24,13 @@ 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")
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")