vbatts/containers-bsi
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #34 from vrothberg/farts

Browse source 
Add BATS_OPTS and fix test flakes
This commit is contained in:
Vincent Batts 2019-09-19 15:43:38 +02:00 committed by GitHub
commit f6d650996c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -1,6 +1,7 @@
SRC := ./BuildSourceImage.sh SRC := ./BuildSourceImage.sh
CTR_IMAGE := localhost/containers/buildsourceimage CTR_IMAGE := localhost/containers/buildsourceimage
CTR_ENGINE ?= podman CTR_ENGINE ?= podman
BATS_OPTS ?=
cleanfiles = cleanfiles =
# these are packages whose src.rpms are very small # these are packages whose src.rpms are very small
srpm_urls = \ srpm_urls = \
@ -9,6 +10,9 @@ srpm_urls = \
https://archive.kernel.org/centos-vault/7.0.1406/os/Source/SPackages/centos-bookmarks-7-1.el7.src.rpm https://archive.kernel.org/centos-vault/7.0.1406/os/Source/SPackages/centos-bookmarks-7-1.el7.src.rpm
srpms = $(addprefix ./.testprep/srpms/,$(notdir $(rpms))) srpms = $(addprefix ./.testprep/srpms/,$(notdir $(rpms)))
export CTR_IMAGE
export CTR_ENGINE
all: validate all: validate
validate: .validate validate: .validate
@ -35,7 +39,7 @@ cleanfiles += .testprep $(srpms)
test-integration: .build-container .testprep test-integration: .build-container .testprep
@echo @echo
@echo "==> Running integration tests" @echo "==> Running integration tests"
CTR_IMAGE=$(CTR_IMAGE) CTR_ENGINE=$(CTR_ENGINE) TMPDIR=$(shell realpath .testprep/tmp) bats test/ TMPDIR=$(shell realpath .testprep/tmp) bats $(BATS_OPTS) test/
clean: clean:

8
test/01-from_rpms.bats
View file

@ -7,19 +7,19 @@ load helpers
d=$(mktemp -d) d=$(mktemp -d)
echo "temporary directory: ${d}" echo "temporary directory: ${d}"
run_ctr -v $(pwd)/.testprep/srpms/:/src:ro -v ${d}:/output/ $CTR_IMAGE -s /src run_ctr -v $(pwd)/.testprep/srpms/:/src:ro --mount type=bind,source=${d},destination=/output $CTR_IMAGE -s /src
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ ${lines[0]} =~ "[SrcImg][INFO] calling source collection drivers" ]] [[ ${lines[0]} =~ "[SrcImg][INFO] calling source collection drivers" ]]
# get the number of the last line # get the number of the last line
n=$(expr ${#lines[@]} - 1) n=$(expr ${#lines[@]} - 1)
[[ ${lines[${n}]} =~ "[SrcImg][INFO] copied to oci:/output:latest-source" ]] [[ ${lines[${n}]} =~ "[SrcImg][INFO] copied to oci:/output:latest-source" ]]
echo "${d}" echo "${d}"
[ -f "${d}/index.json" ] [ -f "${d}/index.json" ]
[ -f "${d}/oci-layout" ] [ -f "${d}/oci-layout" ]
[ "$(du -b ${d}/index.json | awk '{ print $1 }')" -gt 0 ] [ "$(du -b ${d}/index.json | awk '{ print $1 }')" -gt 0 ]
[ "$(du -b ${d}/oci-layout | awk '{ print $1 }')" -gt 0 ] [ "$(du -b ${d}/oci-layout | awk '{ print $1 }')" -gt 0 ]
# let's press that the files are predictable # let's press that the files are predictable
[ "$(find ${d} -type f | wc -l)" -eq 7 ] [ "$(find ${d} -type f | wc -l)" -eq 7 ]
[ -f "${d}/blobs/sha256/3afb43699ea82a69b16efb215363604d9e4ffe16c9ace7e53df66663847309cf" ] [ -f "${d}/blobs/sha256/3afb43699ea82a69b16efb215363604d9e4ffe16c9ace7e53df66663847309cf" ]
@ -32,7 +32,7 @@ load helpers
d=$(mktemp -d) d=$(mktemp -d)
echo "temporary directory: ${d}" echo "temporary directory: ${d}"
run_ctr -v $(pwd)/.testprep/srpms/:/src:ro -v ${d}:/output/ $CTR_IMAGE -s /src -p oci:/output/pushed-image:latest-source run_ctr -v $(pwd)/.testprep/srpms/:/src:ro --mount type=bind,source=${d},destination=/output $CTR_IMAGE -s /src -p oci:/output/pushed-image:latest-source
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run ls ${d}/pushed-image run ls ${d}/pushed-image

2
test/02-from_image_ref.bats
View file

@ -8,7 +8,7 @@ load helpers
echo "temporary directory: ${d}" echo "temporary directory: ${d}"
ref="registry.fedoraproject.org/fedora-minimal" ref="registry.fedoraproject.org/fedora-minimal"
run_ctr -v ${d}:/output/ $CTR_IMAGE -i "${ref}" run_ctr --mount type=bind,source=${d},destination=/output $CTR_IMAGE -i "${ref}"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
#echo ${lines[@]} #echo ${lines[@]}
[[ ${lines[0]} =~ "Getting image source signatures" ]] [[ ${lines[0]} =~ "Getting image source signatures" ]]