diff --git a/libguestfs.changes b/libguestfs.changes index 2b6da98..2277cc3 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 22 10:13:00 UTC 2014 - ohering@suse.com + +- add libguestfs-test subpackage, /usr/share/guestfs (fate#316275) + libguestfs.test.simple.run-libugestfs-test-tool.sh + libguestfs.test.simple.create-opensuse-guest.sh + ------------------------------------------------------------------- Mon Jan 20 23:09:24 CET 2014 - ohering@suse.de diff --git a/libguestfs.spec b/libguestfs.spec index b58e3a3..ca140ae 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -160,6 +160,10 @@ Source11: libguestfs.mkinitrd.setup.sh Source1220: libguestfs.mkinitrd.1220.patch Source1210: libguestfs.mkinitrd.1210.patch Source1110: libguestfs.mkinitrd.1110.patch +# +Source10001: libguestfs.test.simple.run-libugestfs-test-tool.sh +Source10002: libguestfs.test.simple.create-opensuse-guest.sh +# Requires: guestfs-tools %description @@ -327,6 +331,14 @@ BuildRequires: rubygem-rake Allows Ruby scripts to directly use libguestfs. %endif +%package test +Summary: Testcases for libguestfs +License: GPL-2.0 +Group: System/Filesystems + +%description test +This package contains testcases to verify libguestfs functionality. + %package -n guestfs-data # kernel-default needs that %if %{?sles_version}0 > 0 @@ -520,6 +532,12 @@ export NO_BRP_STRIP_DEBUG=true %endif %makeinstall udevrulesdir=%{udevrulesdir} rm -rfv $RPM_BUILD_ROOT%{_libdir}/guestfs/supermin.d +# +mkdir -p $RPM_BUILD_ROOT%{_datadir}/guestfs +cp -avLt $RPM_BUILD_ROOT%{_datadir}/guestfs \ + %{S:10002} \ + %{S:10001} +chmod 0755 $RPM_BUILD_ROOT%{_datadir}/guestfs/* #remove ocaml bindings files if they are disable via rpm macro %if !%{with ocaml_bindings} rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml @@ -704,6 +722,10 @@ rm -rf $RPM_BUILD_ROOT %post -n libguestfs0 -p /sbin/ldconfig %postun -n libguestfs0 -p /sbin/ldconfig +%files test +%defattr(-,root,root) +%{_datadir}/guestfs + %files -n guestfs-data %defattr(-,root,root) %{_libdir}/guestfs diff --git a/libguestfs.test.simple.create-opensuse-guest.sh b/libguestfs.test.simple.create-opensuse-guest.sh new file mode 100644 index 0000000..90c2e2c --- /dev/null +++ b/libguestfs.test.simple.create-opensuse-guest.sh @@ -0,0 +1,229 @@ +#!/bin/bash +# Create an openSUSE image with just enough packages to allow boot to login prompt +# +# Theory of operation: +# This script uses zypper from the host to resolve dependencies +# for zypper which runs within the appliance. If zypper on the host +# is too old, it will be unable to handle repo data from 13.1: +# http://lists.opensuse.org/zypp-devel/2013-11/msg00000.html +# "[zypp-devel] Package conflicting with itself" +# For this reason zypper from 12.3 can be used to install the pattern +# of the final repo. +# First the dependencies of zypper are resolved, the required packages +# are downloaded and extracted with unrpm. Now the guest is started and +# the partitions in the diskimage are prepared. Then the extracted +# package content is copied into the guest. Once that is done zypper +# inside the guest will install the base pattern and a few extra packages. +# Finally the bootloader grub is configured. Once all that is done +# kvm is started. If all goes well a login prompt appears. +# The password for root is "root". +# The guest has also network access to the outside. +# +# Expected runtime: ca. 120 seconds +# +# Expected output: +# guest should start +# no "obvious" errors should be shown during the disk operation +# at the end kvm is started with the generated disk image +# login should be possible +# +set -e +unset LANG +unset ${!LC_*} +cpus=`grep -Ec 'cpu[0-9]' /proc/stat || echo 1` + +output_diskimage=/dev/shm/$LOGNAME/testcase.img +final_repo=http://download.opensuse.org/distribution/12.3/repo/oss/ +initial_repo=http://download.opensuse.org/distribution/13.1/repo/oss/ +force=false +guest_zypper_in__pattern_name="base" +guest_zypper_in__package_list="less vim grub master-boot-code parted nfs-utils" +guest_root_password="root" +diskname_inside_vm=/dev/sda + +_exit() { + echo "Exiting '$0 $*'." + exit 1 +} +until test $# -lt 1 +do + case "$1" in + -n) diskname_inside_vm="$2" ; shift ;; + -o) output_diskimage="$2" ; shift ;; + -R) initial_repo="$2" ; shift ;; + -r) final_repo="$2" ; shift ;; + -f) force=true ;; + -x) set -x ;; + *) echo "Unknown option '$1'" exit 1 ;; + esac + shift +done +if test -z "${initial_repo}" +then + echo "URL to initial repo required. Wrong -R option." + _exit +fi +if test -z "${final_repo}" +then + echo "URL to final repo required. Wrong -r option." + _exit +fi +if test -z "${output_diskimage}" +then + echo "Filename for temporary disk image required. Wrong -o option." + _exit +fi +if test -e "${output_diskimage}" +then + if test "${force}" = "false" + then + echo "Output diskimage '${output_diskimage}' exists." + echo "It will not be overwritten. Option '-f' exists to force overwrite." + _exit + fi +fi +mkdir -vp "${output_diskimage%/*}" +td=`mktemp -d --tmpdir=/dev/shm/${LOGNAME}` +tf=`mktemp --tmpdir=/dev/shm/${LOGNAME}` +_exit() { +rm -rf "$tf" +rm -rf "$td" +} +trap _exit EXIT +dir_repo=${td}/repos.d +dir_root=${td}/root +dir_cache=${td}/cache +mkdir -vp \ + ${dir_root} \ + ${dir_cache} \ + ${dir_repo} +cat > ${tf} < ${dir_repo}/tmp.repo <> etc/resolv.conf +echo nameserver 169.254.2.3 >> etc/resolv.conf +grep -w root /etc/passwd > etc/passwd +grep -w root /etc/group > etc/group +echo 'root::15209::::::' > etc/shadow +cat > etc/fstab < etc/grub.conf < boot/grub/device.map +cat > boot/grub/menu.lst <&1 " : \ +sh "depmod -a \$(get_kernel_version /boot/vmlinuz) ; mkinitrd -B" : \ +sh "dd if=/usr/lib/boot/MBR of=${diskname_inside_vm}" : \ +sh "cp --verbose --sparse=never --remove-destination --target-directory=/boot/grub /usr/lib/grub/*" : \ +sh "grub --batch --verbose < /etc/grub.conf" : \ +sh "echo BOOTPROTO='dhcp' >> /etc/sysconfig/network/ifcfg-eth0" : \ +sh "echo STARTMODE='auto' >> /etc/sysconfig/network/ifcfg-eth0" : \ +sh "echo 'Password for root is ${guest_root_password}' >> /etc/issue" : \ +cat /etc/fstab : \ +quit +ls -lhsS "${output_diskimage}" + +qemu-kvm \ + -global virtio-blk-pci.scsi=off \ + -enable-fips \ + -machine accel=kvm:tcg \ + -cpu host,+kvmclock \ + -m 500 \ + -no-reboot \ + -no-hpet \ + -drive file=${output_diskimage},cache=writeback,id=hd0,if=none \ + -device virtio-blk-pci,drive=hd0 \ + -device virtio-serial-pci \ + -serial stdio \ + -device sga \ + -netdev user,id=usernet,net=169.254.0.0/16 \ + -device virtio-net-pci,netdev=usernet + +exit 0 diff --git a/libguestfs.test.simple.run-libugestfs-test-tool.sh b/libguestfs.test.simple.run-libugestfs-test-tool.sh new file mode 100644 index 0000000..2c37ea4 --- /dev/null +++ b/libguestfs.test.simple.run-libugestfs-test-tool.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# libguestfs-test-tool starts its temporary guest using a dummy disk image +# It creates a partition, a filesystem, mounts it and touches a file +# Once it is done the dummy image is removed again +# Per default it runs in --verbose mode, and our version trace the API calls +# +# Expected runtime: ca. 10 seconds +# +# Expected output: +# guest should start +# no "obvious" errors should be shown during the disk operation +# Somewhere at the end of the verbose output lines like this are expected: +# ... +# libguestfs: trace: touch "/hello" +# ... +# libguestfs: trace: touch = 0 +# +# +set -x +set -e +unset LANG +unset ${!LC_*} +cpus=`grep -Ec 'cpu[0-9]' /proc/stat || echo 1` + +libguestfs-test-tool -V +time libguestfs-test-tool