From 66614ed9bc09d6ad817df655cd7249c2104b7ac7 Mon Sep 17 00:00:00 2001
From: Neil Williams <codehelp@debian.org>
Date: Sat, 7 Nov 2015 13:27:03 +0000
Subject: Add docs on the yarn tests and more build tests

---
 yarns/300-slow-build-tests.yarn | 21 ++++++++++++++++++++-
 yarns/800-future.yarn           |  2 ++
 yarns/900-implements.yarn       |  9 +++++++--
 3 files changed, 29 insertions(+), 3 deletions(-)

(limited to 'yarns')

diff --git a/yarns/300-slow-build-tests.yarn b/yarns/300-slow-build-tests.yarn
index 41d11a3..2ceae72 100644
--- a/yarns/300-slow-build-tests.yarn
+++ b/yarns/300-slow-build-tests.yarn
@@ -14,7 +14,26 @@ These tests are slow, since building images is slow.
     GIVEN user wants to build an image FOO.img that is 2GiB in size
     WHEN the user runs vmdebootstrap --sparse --extlinux
     THEN the image has the correct size
-    AND the image has one partition
+    AND the partition count of the image is 1
     AND partition 1 has the boot flag set
     AND partition 1 has an ext4 filesystem
     AND partition 1 has file /etc/debian_version matching ^8\..*$
+
+    SCENARIO build a Debian 8 image with grub
+    ASSUMING build tests are requested
+    GIVEN user wants to build an image FOO.img that is 2GiB in size
+    WHEN the user runs vmdebootstrap --grub
+    THEN the image has the correct size
+    AND the partition count of the image is 1
+    AND partition 1 has the boot flag set
+    AND partition 1 has an ext4 filesystem
+    AND partition 1 has file /boot/grub/grub.cfg matching ^### BEGIN /etc/grub.d/00_header ###$
+
+    SCENARIO build a Debian 8 image with uefi
+    ASSUMING build tests are requested
+    GIVEN user wants to build an image FOO.img that is 2GiB in size
+    WHEN the user runs vmdebootstrap --grub --use-uefi
+    THEN the image has the correct size
+    AND the partition count of the image is 2
+    AND partition 1 has an vfat filesystem
+    AND partition 2 has file /boot/grub/grub.cfg matching ^### BEGIN /etc/grub.d/00_header ###$
diff --git a/yarns/800-future.yarn b/yarns/800-future.yarn
index 1368b8f..a6ca722 100644
--- a/yarns/800-future.yarn
+++ b/yarns/800-future.yarn
@@ -7,3 +7,5 @@
   More detailed testing of built systems may or may not be
   appropriate: a lot of more intricate testing may be beyond the scope
   of testing of vmdebootstrap.
+* Use the lava-submit.py script to submit a local file to LAVA using
+  the locally installed lava-dispatcher.
diff --git a/yarns/900-implements.yarn b/yarns/900-implements.yarn
index d4c6a7a..9806619 100644
--- a/yarns/900-implements.yarn
+++ b/yarns/900-implements.yarn
@@ -21,6 +21,10 @@ to allow them to run or not to run.
     IMPLEMENTS ASSUMING (fast|build) tests are requested
     test_requested "$MATCH_1"
 
+if `MIRROR` is set, use the default http mirror
+
+    IMPLEMENTS ASSUMING (local|http) tests are requested
+    mirror_requested "$MATCH_1"
 
 ## Building an image, or attempting to
 
@@ -37,6 +41,7 @@ but it's actually restricted to vmdebootstrap in the source tree.
     IMPLEMENTS WHEN the user runs vmdebootstrap (.*)
     PYTHONPATH="$SRCDIR" "$SRCDIR/bin/vmdebootstrap" \
         --image "$IMAGE" \
+        --mirror ${MIRROR:=http://http.debian.net/debian/} \
         --size "$IMAGE_SIZE" \
         $MATCH_1
 
@@ -82,11 +87,11 @@ the image.
 
 Check the partition table on the image.
 
-    IMPLEMENTS THEN the image has one partition
+    IMPLEMENTS THEN the partition count of the image is (\d+)
     parted --script "$IMAGE" print |
         sed '1,/^Number/d' |
         grep -c . |
-        grep -Fx 1
+        grep -Fx $MATCH_1
 
 Check partition boot flag.
 
-- 
cgit v1.2.1