cgwalters/testsuite

Makefile-tests.am

@@ -0,0 +1,41 @@
+# Makefile for tests code
+#
+# Copyright (C) 2013,2014 Colin Walters <walters@verbum.org>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+if BUILDOPT_INSTALL_TESTS
+insttest_PROGRAMS = 
+
+insttestdir=$(pkglibexecdir)/installed-tests
+testfiles = test-basic \
+	$(NULL)
+insttest_SCRIPTS = $(addprefix tests/,$(testfiles:=.sh))
+
+testmetadir = $(datadir)/installed-tests/$(PACKAGE)
+testmeta_DATA = $(testfiles:=.test)
+
+insttest_DATA = tests/libtest.sh \
+	$(NULL)
+
+%.test: tests/%.sh Makefile
+	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
+	 echo 'Exec=$(pkglibexecdir)/installed-tests/$(notdir $<)' >> $@.tmp; \
+	 echo 'Type=session' >> $@.tmp; \
+	 echo 'Output=TAP' >> $@.tmp; \
+	 mv $@.tmp $@)
+
+endif

Makefile.am

@@ -29,4 +29,5 @@ AM_CFLAGS += $(WARN_CFLAGS)
 EXTRA_DIST += autogen.sh COPYING
 
 include Makefile-rpm-ostree.am
+include Makefile-tests.am
 include Makefile-man.am

configure.ac

@@ -37,6 +37,12 @@ AC_PATH_PROG([XSLTPROC], [xsltproc])
 
 GOBJECT_INTROSPECTION_REQUIRE([1.34.0])
 
+AC_ARG_ENABLE(installed_tests,
+              AS_HELP_STRING([--enable-installed-tests],
+                             [Install test programs (default: no)]),,
+              [enable_installed_tests=no])
+AM_CONDITIONAL(BUILDOPT_INSTALL_TESTS, test x$enable_installed_tests = xyes)
+
 AC_ARG_ENABLE(patched-hawkey-and-libsolv,
               AS_HELP_STRING([--enable-patched-hawkey],
                              [Assert that our copy of hawkey and libsolv understand /usr/share/rpm]),,

src/rpmostree-treepkgdiff.c

@@ -192,12 +192,11 @@ rpmostree_print_treepkg_diff (OstreeSysroot    *sysroot,
   gs_unref_object GFile *new_root = NULL;
 
   booted_deployment = ostree_sysroot_get_booted_deployment (sysroot);
-  g_assert (booted_deployment);
+
   g_assert (deployments->len > 1);
-
   new_deployment = deployments->pdata[0];
-
-  if (new_deployment != booted_deployment)
+  
+  if (booted_deployment && new_deployment != booted_deployment)
     {
       booted_root = ostree_sysroot_get_deployment_directory (sysroot, booted_deployment);
       new_root = ostree_sysroot_get_deployment_directory (sysroot, new_deployment);

tests/libtest.sh

@@ -0,0 +1,292 @@
+# Source library for shell script tests
+#
+# Copyright (C) 2011 Colin Walters <walters@verbum.org>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+SRCDIR=$(dirname $0)
+test_tmpdir=$(pwd)
+
+export G_DEBUG=fatal-warnings
+
+export TEST_GPG_KEYID="472CDAFA"
+export TEST_GPG_KEYHOME=${SRCDIR}/gpghome
+export OSTREE_GPG_HOME=${TEST_GPG_KEYHOME}/trusted
+
+if test -n "${OT_TESTS_DEBUG}"; then
+    set -x
+fi
+
+if test -n "$OT_TESTS_VALGRIND"; then
+    CMD_PREFIX="env G_SLICE=always-malloc valgrind -q --leak-check=full --num-callers=30 --suppressions=${SRCDIR}/ostree-valgrind.supp"
+fi
+
+assert_not_reached () {
+    echo $@ 1>&2; exit 1
+}
+
+assert_streq () {
+    test "$1" = "$2" || (echo 1>&2 "$1 != $2"; exit 1)
+}
+
+assert_not_streq () {
+    (! test "$1" = "$2") || (echo 1>&2 "$1 == $2"; exit 1)
+}
+
+assert_has_file () {
+    test -f "$1" || (echo 1>&2 "Couldn't find '$1'"; exit 1)
+}
+
+assert_has_dir () {
+    test -d "$1" || (echo 1>&2 "Couldn't find '$1'"; exit 1)
+}
+
+assert_not_has_file () {
+    if test -f "$1"; then
+	echo 1>&2 "File '$1' exists"; exit 1
+    fi
+}
+
+assert_not_file_has_content () {
+    if grep -q -e "$2" "$1"; then
+	echo 1>&2 "File '$1' incorrectly matches regexp '$2'"; exit 1
+    fi
+}
+
+assert_not_has_dir () {
+    if test -d "$1"; then
+	echo 1>&2 "Directory '$1' exists"; exit 1
+    fi
+}
+
+assert_file_has_content () {
+    if ! grep -q -e "$2" "$1"; then
+	echo 1>&2 "File '$1' doesn't match regexp '$2'"; exit 1
+    fi
+}
+
+setup_test_repository () {
+    mode=$1
+    shift
+
+    oldpwd=`pwd`
+
+    cd ${test_tmpdir}
+    mkdir repo
+    cd repo
+    ot_repo="--repo=`pwd`"
+    export OSTREE="${CMD_PREFIX} ostree ${ot_repo}"
+    if test -n "$mode"; then
+	$OSTREE init --mode=${mode}
+    else
+	$OSTREE init
+    fi
+
+    cd ${test_tmpdir}
+    mkdir files
+    cd files
+    ot_files=`pwd`
+    export ht_files
+    ln -s nosuchfile somelink
+    echo first > firstfile
+
+    cd ${test_tmpdir}/files
+    $OSTREE commit -b test2 -s "Test Commit 1" -m "Commit body first"
+
+    mkdir baz
+    echo moo > baz/cow
+    echo alien > baz/saucer
+    mkdir baz/deeper
+    echo hi > baz/deeper/ohyeah
+    ln -s nonexistent baz/alink
+    mkdir baz/another/
+    echo x > baz/another/y
+
+    cd ${test_tmpdir}/files
+    $OSTREE commit -b test2 -s "Test Commit 2" -m "Commit body second"
+    $OSTREE fsck -q
+
+    cd $oldpwd
+}
+
+setup_fake_remote_repo1() {
+    mode=$1
+    args=$2
+    shift
+    oldpwd=`pwd`
+    mkdir ostree-srv
+    cd ostree-srv
+    mkdir gnomerepo
+    ${CMD_PREFIX} ostree --repo=gnomerepo init --mode=$mode
+    mkdir gnomerepo-files
+    cd gnomerepo-files 
+    echo first > firstfile
+    mkdir baz
+    echo moo > baz/cow
+    echo alien > baz/saucer
+    ${CMD_PREFIX} ostree  --repo=${test_tmpdir}/ostree-srv/gnomerepo commit -b main -s "A remote commit" -m "Some Commit body"
+    mkdir baz/deeper
+    ${CMD_PREFIX} ostree --repo=${test_tmpdir}/ostree-srv/gnomerepo commit -b main -s "Add deeper"
+    echo hi > baz/deeper/ohyeah
+    mkdir baz/another/
+    echo x > baz/another/y
+    ${CMD_PREFIX} ostree --repo=${test_tmpdir}/ostree-srv/gnomerepo commit -b main -s "The rest"
+    cd ..
+    rm -rf gnomerepo-files
+
+    cd ${test_tmpdir}
+    mkdir ${test_tmpdir}/httpd
+    cd httpd
+    ln -s ${test_tmpdir}/ostree-srv ostree
+    ostree trivial-httpd --daemonize -p ${test_tmpdir}/httpd-port $args
+    port=$(cat ${test_tmpdir}/httpd-port)
+    echo "http://127.0.0.1:${port}" > ${test_tmpdir}/httpd-address
+    cd ${oldpwd} 
+
+    export OSTREE="ostree --repo=repo"
+}
+
+setup_os_boot_syslinux() {
+    # Stub syslinux configuration
+    mkdir -p sysroot/boot/loader.0
+    ln -s loader.0 sysroot/boot/loader
+    touch sysroot/boot/loader/syslinux.cfg
+    # And a compatibility symlink
+    mkdir -p sysroot/boot/syslinux
+    ln -s ../loader/syslinux.cfg sysroot/boot/syslinux/syslinux.cfg
+}
+
+setup_os_boot_uboot() {
+    # Stub U-Boot configuration
+    mkdir -p sysroot/boot/loader.0
+    ln -s loader.0 sysroot/boot/loader
+    touch sysroot/boot/loader/uEnv.txt
+    # And a compatibility symlink
+    ln -s loader/uEnv.txt sysroot/boot/uEnv.txt
+}
+
+setup_os_repository () {
+    mode=$1
+    bootmode=$2
+    shift
+
+    oldpwd=`pwd`
+
+    cd ${test_tmpdir}
+    mkdir testos-repo
+    if test -n "$mode"; then
+	ostree --repo=testos-repo init --mode=${mode}
+    else
+	ostree --repo=testos-repo init
+    fi
+
+    cd ${test_tmpdir}
+    mkdir osdata
+    cd osdata
+    mkdir -p boot usr/bin usr/lib/modules/3.6.0 usr/share usr/etc
+    echo "a kernel" > boot/vmlinuz-3.6.0
+    echo "an initramfs" > boot/initramfs-3.6.0
+    bootcsum=$(cat boot/vmlinuz-3.6.0 boot/initramfs-3.6.0 | sha256sum | cut -f 1 -d ' ')
+    export bootcsum
+    mv boot/vmlinuz-3.6.0 boot/vmlinuz-3.6.0-${bootcsum}
+    mv boot/initramfs-3.6.0 boot/initramfs-3.6.0-${bootcsum}
+
+    echo "an executable" > usr/bin/sh
+    echo "some shared data" > usr/share/langs.txt
+    echo "a library" > usr/lib/libfoo.so.0
+    ln -s usr/bin bin
+cat > usr/etc/os-release <<EOF
+NAME=TestOS
+VERSION=42
+ID=testos
+VERSION_ID=42
+PRETTY_NAME="TestOS 42"
+EOF
+    echo "a config file" > usr/etc/aconfigfile
+    mkdir -p usr/etc/NetworkManager
+    echo "a default daemon file" > usr/etc/NetworkManager/nm.conf
+    mkdir -p usr/etc/testdirectory
+    echo "a default daemon file" > usr/etc/testdirectory/test
+
+    ostree --repo=${test_tmpdir}/testos-repo commit -b testos/buildmaster/x86_64-runtime -s "Build"
+
+    # Ensure these commits have distinct second timestamps
+    sleep 2
+    echo "a new executable" > usr/bin/sh
+    ostree --repo=${test_tmpdir}/testos-repo commit -b testos/buildmaster/x86_64-runtime -s "Build"
+
+    cd ${test_tmpdir}
+    cp -a osdata osdata-devel
+    cd osdata-devel
+    mkdir -p usr/include
+    echo "a development header" > usr/include/foo.h
+    ostree --repo=${test_tmpdir}/testos-repo commit -b testos/buildmaster/x86_64-devel -s "Build"
+
+    ostree --repo=${test_tmpdir}/testos-repo fsck -q
+
+    cd ${test_tmpdir}
+    mkdir sysroot
+    ostree admin --sysroot=sysroot init-fs sysroot
+    ostree admin --sysroot=sysroot os-init testos
+
+    case $bootmode in
+        "syslinux")
+	    setup_os_boot_syslinux
+            ;;
+        "uboot")
+	    setup_os_boot_uboot
+            ;;
+    esac
+
+    cd ${test_tmpdir}
+    mkdir ${test_tmpdir}/httpd
+    cd httpd
+    ln -s ${test_tmpdir} ostree
+    ostree trivial-httpd --daemonize -p ${test_tmpdir}/httpd-port $args
+    port=$(cat ${test_tmpdir}/httpd-port)
+    echo "http://127.0.0.1:${port}" > ${test_tmpdir}/httpd-address
+    cd ${oldpwd} 
+}
+
+os_repository_new_commit ()
+{
+    boot_checksum_iteration=$1
+    content_iteration=$2
+    echo "BOOT ITERATION: $boot_checksum_iteration"
+    if test -z "$boot_checksum_iteration"; then
+	boot_checksum_iteration=0
+    fi
+    if test -z "$content_iteration"; then
+	content_iteration=0
+    fi
+    cd ${test_tmpdir}/osdata
+    rm boot/*
+    echo "new: a kernel ${boot_checksum_iteration}" > boot/vmlinuz-3.6.0
+    echo "new: an initramfs ${boot_checksum_iteration}" > boot/initramfs-3.6.0
+    bootcsum=$(cat boot/vmlinuz-3.6.0 boot/initramfs-3.6.0 | sha256sum | cut -f 1 -d ' ')
+    export bootcsum
+    mv boot/vmlinuz-3.6.0 boot/vmlinuz-3.6.0-${bootcsum}
+    mv boot/initramfs-3.6.0 boot/initramfs-3.6.0-${bootcsum}
+
+    echo "a new default config file" > usr/etc/a-new-default-config-file
+    mkdir -p usr/etc/new-default-dir
+    echo "a new default dir and file" > usr/etc/new-default-dir/moo
+
+    echo "content iteration ${content_iteration}" > usr/bin/content-iteration
+
+    ostree --repo=${test_tmpdir}/testos-repo commit -b testos/buildmaster/x86_64-runtime -s "Build"
+    cd ${test_tmpdir}
+}