Merge lp:~elopio/snappy/resize_test into lp:~snappy-dev/snappy/snappy-moved-to-github

[Leo Arias]

[lp:~elopio/snappy/resize_test]

669. By Leo Arias on 2015-09-10

Added the remove reboot mark.

670. By Leo Arias on 2015-09-10

Fixed the expected free size.

671. By Leo Arias on 2015-09-10

Fixed the expected free size.

672. By Leo Arias on 2015-09-10

Fixed format.

673. By Leo Arias on 2015-09-10

Fixed format.

674. By Leo Arias on 2015-09-13

Merged with prerequisite.

675. By Leo Arias on 2015-09-22

First remove the original initrd.img.

676. By Leo Arias on 2015-09-23

For mbr, resize the partition with sfdisk and using sectors.

677. By Leo Arias on 2015-09-23

Added comments.

678. By Leo Arias on 2015-09-23

Added setup and teardown.

679. By Leo Arias on 2015-10-07

Merged with trunk.

680. By Leo Arias on 2015-10-07

Fixed the name of the initrd.img

681. By Leo Arias on 2015-10-07

Fixed the call to ExecCommand.

682. By Leo Arias on 2015-10-07

Fixed set up and tear down.

Unmerged revisions

=== modified file '_integration-tests/data/tpl/control'
--- _integration-tests/data/tpl/control	2015-07-22 16:36:14 +0000
+++ _integration-tests/data/tpl/control	2015-09-10 17:31:29 +0000
@@ -1,4 +1,4 @@
 {{ $filter := .Filter }}
 {{ $test := .Test }}
-Test-Command: ./_integration-tests/reboot-wrapper {{ $test }} {{ if $filter }}-gocheck.f {{ $filter }}{{ end }}
+Test-Command: ./_integration-tests/scripts/reboot-wrapper {{ $test }} {{ if $filter }}-gocheck.f {{ $filter }}{{ end }}
 Restrictions: allow-stderr
 
=== added directory '_integration-tests/scripts'
=== renamed file '_integration-tests/tests/get_unpartitioned_space' => '_integration-tests/scripts/get_unpartitioned_space'
--- _integration-tests/tests/get_unpartitioned_space	2015-09-04 06:05:56 +0000
+++ _integration-tests/scripts/get_unpartitioned_space	2015-09-10 17:31:29 +0000
@@ -5,4 +5,4 @@
 writable_part="$(findfs LABEL=writable)"
 syspath="$(dirname $(realpath /sys/class/block/$(basename $writable_part)))"
 device="$(realpath /dev/block/$(cat $syspath/dev))"
-sudo parted $device unit % print free | grep 'Free Space' | tail -n1 | awk '{print $3}'
+sudo parted -s $device unit % print free | grep 'Free Space' | tail -n1 | awk '{print $3}'
 
=== added file '_integration-tests/scripts/install-test-initramfs'
--- _integration-tests/scripts/install-test-initramfs	1970-01-01 00:00:00 +0000
+++ _integration-tests/scripts/install-test-initramfs	2015-09-10 17:31:29 +0000
@@ -0,0 +1,19 @@
+#! /bin/sh -e
+# Prepare the initramfs image for the tests.
+
+current_boot_dir=$1
+writable_percent=$2
+tree_dir=$(pwd)
+initrd_unpack_dir=$ADT_ARTIFACTS/initrd
+
+cp ${current_boot_dir}/initrd.img /tmp/initrd.xz
+cd /tmp/
+unxz /tmp/initrd.xz
+mkdir $initrd_unpack_dir || true
+cd $initrd_unpack_dir
+cpio -id < /tmp/initrd
+cp $tree_dir/_integration-tests/scripts/resize-writable-test scripts/local-premount/
+sed -i "s/writable_percent=.*/writable_percent=${writable_percent}/" scripts/local-premount/resize-writable-test
+sed -i '1i /scripts/local-premount/resize-writable-test "$@"\n[ -e /conf/param.conf ] && . /conf/param.conf' scripts/local-premount/ORDER
+find .|cpio -o -H newc|xz -c -7 --check=crc32 > initrd.img
+sudo mv initrd.img $current_boot_dir
 
=== renamed file '_integration-tests/reboot-wrapper' => '_integration-tests/scripts/reboot-wrapper'
=== added file '_integration-tests/scripts/resize-writable-test'
--- _integration-tests/scripts/resize-writable-test	1970-01-01 00:00:00 +0000
+++ _integration-tests/scripts/resize-writable-test	2015-09-10 17:31:29 +0000
@@ -0,0 +1,118 @@
+#! /bin/sh -e
+# initramfs local-premount script to resize writable for testing
+
+PREREQ=""
+
+# Output pre-requisites
+prereqs()
+{
+        echo "$PREREQ"
+}
+
+case "$1" in
+    prereqs)
+        prereqs
+        exit 0
+        ;;
+esac
+
+TMPFILE="/run/initramfs/old-table-test.txt"
+LOGFILE="/run/initramfs/resize-writable-test.log"
+
+writable_percent=100
+
+wait-for-root "LABEL=writable" "${ROOTDELAY:-180}" >/dev/null || true
+
+writable_part="$(findfs LABEL=writable)"
+
+syspath="$(dirname $(realpath /sys/class/block/$(basename $writable_part)))"
+device="$(realpath /dev/block/$(cat $syspath/dev))"
+partition=$(cat $syspath/$(basename $writable_part)/partition)
+
+device_size="$(($(cat $syspath/size)/2))"
+
+get_end()
+{
+    NUM=$1
+    lastpart="$(grep -cE ^'[0-9]{1,}': $TMPFILE)"
+    if [ "$lastpart" = "$NUM" ]; then
+        endsize="$(parted -ms $DEV unit B print| grep ^/ | cut -d: -f2|sed 's/B$//')"
+    else
+        # we are not at the end ! get the start of the next partition
+        # (minus 1 byte) instead of using the absolute end of the disk
+        endsize=$(($(parted -ms $DEV unit B print|grep ^$(($num+1)):|\
+            cut -d: -f2|sed 's/B$//')-1))
+    fi
+    echo "endsize: ${endsize}" >/dev/kmsg || true
+    endsize_percent=$(($endsize*$writable_percent/100))
+    echo "endsize percent: ${endsize_percent}" >/dev/kmsg || true
+    echo "$endsize_percent"B
+}
+
+do_gpt()
+{
+    DEV=$1
+    # create new empty GPT
+    parted -s $DEV mklabel gpt
+    oIFS=$IFS
+    IFS=:
+    # re-create all partitions from backup table
+    grep -E ^'[0-9]{1,}': $TMPFILE|while read -r num start end size type name flags; do
+        if [ "$name" = "writable" ]; then
+            endsize=$(get_end $num)
+            parted -s $DEV mkpart \"$name\" \"$type\" $start $endsize
+        else
+            flags="$(echo $flags|sed -e 's/[,;]//g' -e 's/ /:/')"
+            parted -s $DEV mkpart \"$name\" \"$type\" $start $end
+            if [ -n "$flags" ]; then
+                for flag in ${flags}; do
+                    parted -s $DEV set $num $flag on
+                done
+            fi
+        fi
+    done
+    IFS=$oIFS
+    parted -ms $DEV unit B print >/run/initramfs/new-gpt-table.txt 2>/dev/null
+}
+
+do_mbr()
+{
+    DEV=$1
+    PART=$2
+    endsize=$(get_end $PART)
+    parted -s $DEV resizepart $PART $endsize
+}
+
+
+echo "initrd: resize ${writable_part} to ${writable_percent}% of the disk" >/dev/kmsg || true
+echo "initrd: see ${LOGFILE} for details" >/dev/kmsg || true
+
+# check the filesystem before attempting re-size
+e2fsck -fy $writable_part >>$LOGFILE 2>&1
+# shrink the filesystem to the minimum
+resize2fs -M $writable_part >>$LOGFILE 2>&1
+
+# back up the original partition table for later use or debugging
+parted -ms $device unit B print >$TMPFILE 2>/dev/null
+table="$(parted -ms $device print| grep ^/| cut -d: -f6)"
+case $table in
+    gpt)
+        # do_gpt needs the device name
+        do_gpt $device >>$LOGFILE 2>&1
+        ;;
+    mbr|msdos)
+        # do_mbr needs the device node and partition number
+        do_mbr $device $partition >>$LOGFILE 2>&1
+        resizeopts="-f"
+            ;;
+    *)
+        echo "unknown partition table type, not resizing" >>$LOGFILE
+        exit 0
+        ;;
+esac
+# make sure we re read the partition table in any case
+blockdev --rereadpt $device >>$LOGFILE 2>&1
+# check the filesystem before attempting re-size
+e2fsck -fy $writable_part >>$LOGFILE 2>&1
+# resize the filesystem to full size of the partition
+resize2fs $resizeopts $writable_part >>$LOGFILE 2>&1
 
=== modified file '_integration-tests/tests/initramfs_test.go'
--- _integration-tests/tests/initramfs_test.go	2015-09-04 13:48:32 +0000
+++ _integration-tests/tests/initramfs_test.go	2015-09-10 17:31:29 +0000
@@ -21,10 +21,12 @@
 
 import (
 	"os/exec"
+	"path"
 	"strconv"
 	"strings"
 
 	"launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/partition"	
 
 	"gopkg.in/check.v1"
 )
@@ -35,13 +37,52 @@
 	common.SnappySuite
 }
 
-func (s *initRAMFSSuite) TestFreeSpace(c *check.C) {
-	cmd := exec.Command("sh", "_integration-tests/tests/get_unpartitioned_space")
+func getFreeSpacePercent(c *check.C) float64 {
+	cmd := exec.Command("sh", "_integration-tests/scripts/get_unpartitioned_space")
 	free, err := cmd.Output()
+	c.Assert(err, check.IsNil, check.Commentf("Error running the script to get the free space: %s", err))
 	freePercent := strings.TrimRight(strings.TrimSpace(string(free)), "%")
 	freePercentFloat, err := strconv.ParseFloat(freePercent, 32)
 	c.Assert(err, check.IsNil,
 		check.Commentf("Error converting the free space percentage to float: %s", err))
-	c.Assert(freePercentFloat < 10, check.Equals, true,
-		check.Commentf("The free space at the end of the disk is greater than 10%"))
+	return freePercentFloat
+}
+
+func getCurrentBootDir(c *check.C) string {
+	system, err := partition.BootSystem()
+	c.Assert(err, check.IsNil, check.Commentf("Error getting the boot system: %s", err))
+	bootDir := partition.BootDir(system)
+	current, err := partition.CurrentPartition()
+	c.Assert(err, check.IsNil, check.Commentf("Error getting the current partition: %s", err))
+	return path.Join(bootDir, current)
+}
+
+func (s *initRAMFSSuite) TestFreeSpaceWithoutResize(c *check.C) {
+  writablePercent := "95"	
+	if common.BeforeReboot() {
+		bootDir := getCurrentBootDir(c)
+		common.ExecCommand(
+			c, "sh", "-x", "_integration-tests/scripts/install-test-initramfs", bootDir, writablePercent)
+		common.Reboot(c)
+	} else if common.AfterReboot(c) {
+		common.RemoveRebootMark(c)		
+		freeSpace := getFreeSpacePercent(c)
+		c.Assert(freeSpace, check.Equals, writablePercent,
+			check.Commentf("The writable partition was resized"))
+	}	
+}
+
+func (s *initRAMFSSuite) TestFreeSpaceWithResize(c *check.C) {
+	if common.BeforeReboot() {
+		bootDir := getCurrentBootDir(c)
+		writablePercent := "85"
+		common.ExecCommand(
+			c, "sh", "-x", "_integration-tests/scripts/install-test-initramfs", bootDir, writablePercent)
+		common.Reboot(c)
+	} else if common.AfterReboot(c) {
+		common.RemoveRebootMark(c)
+		freeSpace := getFreeSpacePercent(c)
+		c.Assert(freeSpace < 10, check.Equals, true,
+			check.Commentf("The writable partition was not resized"))
+	}
 }