From 0a87d8cb91007cdd38cfaee37dd5654b29c8cbe5 Mon Sep 17 00:00:00 2001
From: Tudor Marcu <tudor.marcu@intel.com>
Date: Wed, 24 Jan 2018 11:25:39 -0800
Subject: [PATCH] Add BAT tests for mixer command-line testing

These tests should be reporting on the structure and correctness of mixer
and its user interface. Due to them running very slowly on the Travis CI
environment, they are not run by default, but can be run locally with
make batcheck.

This patch also introduces a docker container to do the build, so we do not
have to worry about running this in different environments such as Travis
CI. The tests are thus confined to a strict, well-known workspace,
and we can avoid many dependency problems.

Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>
---
 .travis.yml                                   | 13 ++--
 Dockerfile                                    | 14 ++++
 Makefile                                      |  1 +
 Makefile.bats                                 | 18 +++++
 bat/lib/mixerlib.bash                         | 75 +++++++++++++++++++
 bat/tests/01-create-simple-mix/Makefile       |  9 +++
 .../01-create-simple-mix/description.txt      |  4 +
 bat/tests/01-create-simple-mix/run.bats       | 22 ++++++
 bat/tests/02-mix-clear-bundles/Makefile       |  9 +++
 .../02-mix-clear-bundles/description.txt      |  4 +
 bat/tests/02-mix-clear-bundles/run.bats       | 33 ++++++++
 .../03-create-mix-with-unique-bundle/Makefile |  9 +++
 .../description.txt                           |  4 +
 .../03-create-mix-with-unique-bundle/run.bats | 27 +++++++
 .../Makefile                                  |  9 +++
 .../description.txt                           |  4 +
 .../run.bats                                  | 28 +++++++
 .../Makefile                                  |  9 +++
 .../description.txt                           |  4 +
 .../run.bats                                  | 33 ++++++++
 .../Makefile                                  |  9 +++
 .../description.txt                           |  4 +
 .../run.bats                                  | 28 +++++++
 .../Makefile                                  |  9 +++
 .../description.txt                           |  4 +
 .../run.bats                                  | 29 +++++++
 bat/tests/08-test-format-bump/Makefile        |  9 +++
 bat/tests/08-test-format-bump/description.txt |  6 ++
 bat/tests/08-test-format-bump/run.bats        |  9 +++
 29 files changed, 428 insertions(+), 8 deletions(-)
 create mode 100644 Dockerfile
 create mode 100644 Makefile.bats
 create mode 100755 bat/lib/mixerlib.bash
 create mode 100755 bat/tests/01-create-simple-mix/Makefile
 create mode 100644 bat/tests/01-create-simple-mix/description.txt
 create mode 100755 bat/tests/01-create-simple-mix/run.bats
 create mode 100755 bat/tests/02-mix-clear-bundles/Makefile
 create mode 100644 bat/tests/02-mix-clear-bundles/description.txt
 create mode 100755 bat/tests/02-mix-clear-bundles/run.bats
 create mode 100755 bat/tests/03-create-mix-with-unique-bundle/Makefile
 create mode 100644 bat/tests/03-create-mix-with-unique-bundle/description.txt
 create mode 100755 bat/tests/03-create-mix-with-unique-bundle/run.bats
 create mode 100755 bat/tests/04-add-unique-package-to-clear-bundle/Makefile
 create mode 100644 bat/tests/04-add-unique-package-to-clear-bundle/description.txt
 create mode 100755 bat/tests/04-add-unique-package-to-clear-bundle/run.bats
 create mode 100755 bat/tests/05-remove-package-from-clear-bundle/Makefile
 create mode 100644 bat/tests/05-remove-package-from-clear-bundle/description.txt
 create mode 100755 bat/tests/05-remove-package-from-clear-bundle/run.bats
 create mode 100755 bat/tests/06-create-mix-with-swapped-clear-packages/Makefile
 create mode 100644 bat/tests/06-create-mix-with-swapped-clear-packages/description.txt
 create mode 100755 bat/tests/06-create-mix-with-swapped-clear-packages/run.bats
 create mode 100755 bat/tests/07-add-clear-package-to-custom-bundle/Makefile
 create mode 100644 bat/tests/07-add-clear-package-to-custom-bundle/description.txt
 create mode 100755 bat/tests/07-add-clear-package-to-custom-bundle/run.bats
 create mode 100755 bat/tests/08-test-format-bump/Makefile
 create mode 100644 bat/tests/08-test-format-bump/description.txt
 create mode 100755 bat/tests/08-test-format-bump/run.bats

diff --git a/.travis.yml b/.travis.yml
index 9b4ea3f..750ce06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,14 +6,11 @@ go:
 
 go_import_path: github.com/clearlinux/mixer-tools
 
+services:
+    - docker
+
 before_install:
-    - sudo apt-get update -qq
-    - go get -u gopkg.in/alecthomas/gometalinter.v2
-    - gometalinter.v2 --install
-    - wget https://github.com/clearlinux/bsdiff/releases/download/v1.0.2/bsdiff-1.0.2.tar.xz
-    - tar -xvf bsdiff-1.0.2.tar.xz
-    - pushd bsdiff-1.0.2 && ./configure --prefix=/usr --disable-tests && make -j48 && sudo make install && popd
+    - docker build -t testdock .
 
 script:
-    - make lint
-    - make check
+    - docker run testdock
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..23fe83f
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,14 @@
+FROM clearlinux:latest
+
+ENV GOPATH /home/gopath
+ENV PATH="/home/gopath/bin:${PATH}"
+COPY . / /home/gopath/src/github.com/clearlinux/mixer-tools/
+RUN swupd bundle-add mixer go-basic c-basic os-core-update-dev && \
+    git config --global user.email "travis@example.com" && \
+    git config --global user.name "Travis CI" && \
+    clrtrust generate && \
+    go get -u gopkg.in/alecthomas/gometalinter.v2 && \
+    gometalinter.v2 --install
+
+ENTRYPOINT ["/bin/sh", "-c", "cd /home/gopath/src/github.com/clearlinux/mixer-tools && make && make install && make lint; make check"]
+
diff --git a/Makefile b/Makefile
index 532a6e1..17f24fd 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@
 #
 # For historical purposes, it also works in a development environment
 # when the repository is already inside a GOPATH.
+include Makefile.bats
 
 .NOTPARALLEL:
 
diff --git a/Makefile.bats b/Makefile.bats
new file mode 100644
index 0000000..8334e79
--- /dev/null
+++ b/Makefile.bats
@@ -0,0 +1,18 @@
+SUBMAKEFILES := $(shell find bat/tests/ -name Makefile)
+DIRS2RUNMAKECHECK := $(addprefix checkdir-,${SUBMAKEFILES})
+DIRS2RUNMAKECLEAN := $(addprefix clean-,${SUBMAKEFILES})
+
+batcheck: ${DIRS2RUNMAKECHECK}
+
+${DIRS2RUNMAKECHECK}: checkdir-%:
+	$(MAKE) -C $(dir $(subst checkdir-,,$@)) check
+
+batclean: $(DIRS2RUNMAKECLEAN)
+
+${DIRS2RUNMAKECLEAN}: clean-%:
+	$(MAKE) -C $(dir $(subst clean-,,$@)) clean
+
+.PHONY: batcheck
+.PHONY: batclean
+.PHONY: ${DIRS2RUNMAKECHECK}
+.PHONY: ${DIRS2RUNMAKECLEAN}
diff --git a/bat/lib/mixerlib.bash b/bat/lib/mixerlib.bash
new file mode 100755
index 0000000..8e2d8ee
--- /dev/null
+++ b/bat/lib/mixerlib.bash
@@ -0,0 +1,75 @@
+# NOTE: source this file from a BATS test case file
+
+# This library defines functions to use in the BATS test files during a local
+# test run with 'make check'.
+
+export cachedir="$HOME/.cache/mixer-tests"
+logdir="$BATS_TEST_DIRNAME/logs"
+BUNDLE_DIR="$BATS_TEST_DIRNAME/local-bundles"
+CLRVER=$(curl https://download.clearlinux.org/latest)
+CLR_BUNDLES="$BATS_TEST_DIRNAME/upstream-bundles/clr-bundles-$CLRVER/bundles"
+BUNDLE_LIST="$BATS_TEST_DIRNAME/mixbundles"
+mkdir -p $cachedir
+mkdir -p $logdir
+
+setup_builder_conf() {
+:
+}
+
+localize_builder_conf() {
+  echo "LOCAL_RPM_DIR = $BATS_TEST_DIRNAME/local-rpms
+LOCAL_REPO_DIR = $BATS_TEST_DIRNAME/local-yum" >> $BATS_TEST_DIRNAME/builder.conf
+}
+
+mixer-init-versions() {
+  sudo -E mixer init --clear-version $1 --mix-version $2 --new-swupd
+}
+
+clean-bundle-dir() {
+  sudo rm -rf $BUNDLE_DIR/*
+  echo -e "filesystem\n" | sudo tee $BUNDLE_DIR/os-core > /dev/null
+}
+
+mixer-build-chroots() {
+  sudo -E mixer build chroots --config $BATS_TEST_DIRNAME/builder.conf --new-swupd --new-chroots
+}
+
+mixer-create-update() {
+  sudo -E mixer build update --config $BATS_TEST_DIRNAME/builder.conf --new-swupd
+}
+
+mixer-add-rpms() {
+  mkdir -p ./local ./rpms
+  sudo -E mixer add-rpms --config $BATS_TEST_DIRNAME/builder.conf --new-swupd
+}
+
+add-bundle() {
+  sudo touch $BUNDLE_DIR/$1
+}
+
+add-package() {
+  echo $1 | sudo tee -a $BUNDLE_DIR/$2 > /dev/null
+  sudo mixer bundle add $2
+}
+
+add-clear-bundle() {
+  sudo cp $CLR_BUNDLES/$1 $BUNDLE_DIR
+  sudo mixer bundle add $1
+}
+
+remove-bundle() {
+  sudo sed -i "/$1/d" $BUNDLE_LIST
+}
+
+remove-package() {
+  sudo sed -i "/$1/d" $BUNDLE_DIR/$2
+}
+
+download-rpm() {
+  mkdir -p ./rpms
+  pushd rpms
+  sudo curl -O $1
+  popd
+}
+
+# vi: ft=sh ts=8 sw=2 sts=2 et tw=80
diff --git a/bat/tests/01-create-simple-mix/Makefile b/bat/tests/01-create-simple-mix/Makefile
new file mode 100755
index 0000000..2ae12ec
--- /dev/null
+++ b/bat/tests/01-create-simple-mix/Makefile
@@ -0,0 +1,9 @@
+.PHONY: check clean
+
+check:
+	bats ./run.bats
+
+CLEANDIRS = ./update ./test-chroot ./logs ./.repos ./bundles ./update ./mix-bundles ./clr-bundles ./local ./results ./repodata ./rpms ./upstream-bundles ./local-bundles
+CLEANFILES = ./*.log ./run.bats.trs ./yum.conf.in ./builder.conf ./.{c,m}* *.pem .yum-mix.conf mixversion upstreamurl upstreamversion mixbundles
+clean:
+	sudo rm -rf $(CLEANDIRS) $(CLEANFILES)
diff --git a/bat/tests/01-create-simple-mix/description.txt b/bat/tests/01-create-simple-mix/description.txt
new file mode 100644
index 0000000..c4d6020
--- /dev/null
+++ b/bat/tests/01-create-simple-mix/description.txt
@@ -0,0 +1,4 @@
+01-create-simple-mix
+====================
+This test case creates a mix with no custom changes, simply creating an
+initial version 10, bumping the version to 20, and creating another update.
diff --git a/bat/tests/01-create-simple-mix/run.bats b/bat/tests/01-create-simple-mix/run.bats
new file mode 100755
index 0000000..cfdc6d3
--- /dev/null
+++ b/bat/tests/01-create-simple-mix/run.bats
@@ -0,0 +1,22 @@
+#!/usr/bin/env bats
+
+# shared test functions
+load ../../lib/mixerlib
+
+setup() {
+  setup_builder_conf
+}
+
+@test "Create initial mix 10" {
+  mixer-init-versions $CLRVER 10
+  clean-bundle-dir
+  mixer-build-chroots
+  mixer-create-update
+}
+
+@test "Create version 20 with no changes" {
+  mixer-init-versions $CLRVER 20
+  mixer-build-chroots
+  mixer-create-update > $BATS_TEST_DIRNAME/create_update20.log
+}
+# vi: ft=sh ts=8 sw=2 sts=2 et tw=80
diff --git a/bat/tests/02-mix-clear-bundles/Makefile b/bat/tests/02-mix-clear-bundles/Makefile
new file mode 100755
index 0000000..2ae12ec
--- /dev/null
+++ b/bat/tests/02-mix-clear-bundles/Makefile
@@ -0,0 +1,9 @@
+.PHONY: check clean
+
+check:
+	bats ./run.bats
+
+CLEANDIRS = ./update ./test-chroot ./logs ./.repos ./bundles ./update ./mix-bundles ./clr-bundles ./local ./results ./repodata ./rpms ./upstream-bundles ./local-bundles
+CLEANFILES = ./*.log ./run.bats.trs ./yum.conf.in ./builder.conf ./.{c,m}* *.pem .yum-mix.conf mixversion upstreamurl upstreamversion mixbundles
+clean:
+	sudo rm -rf $(CLEANDIRS) $(CLEANFILES)
diff --git a/bat/tests/02-mix-clear-bundles/description.txt b/bat/tests/02-mix-clear-bundles/description.txt
new file mode 100644
index 0000000..b2d2fcb
--- /dev/null
+++ b/bat/tests/02-mix-clear-bundles/description.txt
@@ -0,0 +1,4 @@
+02-mix-clear-bundles
+====================
+This test creates an initial version 10, a version 20 with Clear bundles
+added, and a version 30 with one of those bundles removed.
diff --git a/bat/tests/02-mix-clear-bundles/run.bats b/bat/tests/02-mix-clear-bundles/run.bats
new file mode 100755
index 0000000..86f898c
--- /dev/null
+++ b/bat/tests/02-mix-clear-bundles/run.bats
@@ -0,0 +1,33 @@
+#!/usr/bin/env bats
+
+# shared test functions
+load ../../lib/mixerlib
+
+setup() {
+  setup_builder_conf
+}
+
+@test "Create initial mix 10" {
+  mixer-init-versions $CLRVER 10
+  clean-bundle-dir
+  mixer-build-chroots
+  mixer-create-update > $BATS_TEST_DIRNAME/create_update-10.log
+}
+
+@test "Create version 20 with more Clear bundles" {
+  mixer-init-versions $CLRVER 20
+  add-bundle "editors"
+  add-package "joe" "editors"
+  add-bundle "os-core-update"
+  add-package "bsdiff" "os-core-update"
+  mixer-build-chroots
+  mixer-create-update > $BATS_TEST_DIRNAME/create_update-20.log
+}
+@test "Create version 30 with Clear bundle deleted" {
+  mixer-init-versions $CLRVER 30
+  remove-bundle "editors"
+  mixer-build-chroots
+  mixer-create-update > $BATS_TEST_DIRNAME/create_update-30.log
+}
+
+# vi: ft=sh ts=8 sw=2 sts=2 et tw=80
diff --git a/bat/tests/03-create-mix-with-unique-bundle/Makefile b/bat/tests/03-create-mix-with-unique-bundle/Makefile
new file mode 100755
index 0000000..2ae12ec
--- /dev/null
+++ b/bat/tests/03-create-mix-with-unique-bundle/Makefile
@@ -0,0 +1,9 @@
+.PHONY: check clean
+
+check:
+	bats ./run.bats
+
+CLEANDIRS = ./update ./test-chroot ./logs ./.repos ./bundles ./update ./mix-bundles ./clr-bundles ./local ./results ./repodata ./rpms ./upstream-bundles ./local-bundles
+CLEANFILES = ./*.log ./run.bats.trs ./yum.conf.in ./builder.conf ./.{c,m}* *.pem .yum-mix.conf mixversion upstreamurl upstreamversion mixbundles
+clean:
+	sudo rm -rf $(CLEANDIRS) $(CLEANFILES)
diff --git a/bat/tests/03-create-mix-with-unique-bundle/description.txt b/bat/tests/03-create-mix-with-unique-bundle/description.txt
new file mode 100644
index 0000000..50adff6
--- /dev/null
+++ b/bat/tests/03-create-mix-with-unique-bundle/description.txt
@@ -0,0 +1,4 @@
+03-create-mix-with-unique-bundle
+================================
+This test creates an initial version 10, a version 20 with a unique bundle
+that does not exist in Clear, and contains a package that is not in Clear.
diff --git a/bat/tests/03-create-mix-with-unique-bundle/run.bats b/bat/tests/03-create-mix-with-unique-bundle/run.bats
new file mode 100755
index 0000000..6cf3b5a
--- /dev/null
+++ b/bat/tests/03-create-mix-with-unique-bundle/run.bats
@@ -0,0 +1,27 @@
+#!/usr/bin/env bats
+
+# shared test functions
+load ../../lib/mixerlib
+
+setup() {
+  setup_builder_conf
+}
+
+@test "Create initial mix 10" {
+  mixer-init-versions $CLRVER 10
+  clean-bundle-dir
+  mixer-build-chroots
+  mixer-create-update
+}
+
+@test "Create version 20 with unique custom bundle" {
+  localize_builder_conf
+  mixer-init-versions $CLRVER 20
+  download-rpm "ftp://rpmfind.net/linux/fedora-secondary/development/rawhide/source/SRPMS/j/json-c-0.12-7.fc24.src.rpm"
+  mixer-add-rpms
+  add-bundle "testbundle"
+  add-package "json-c" "testbundle"
+  mixer-build-chroots
+  mixer-create-update > $BATS_TEST_DIRNAME/create_update-20.log
+}
+# vi: ft=sh ts=8 sw=2 sts=2 et tw=80
diff --git a/bat/tests/04-add-unique-package-to-clear-bundle/Makefile b/bat/tests/04-add-unique-package-to-clear-bundle/Makefile
new file mode 100755
index 0000000..2ae12ec
--- /dev/null
+++ b/bat/tests/04-add-unique-package-to-clear-bundle/Makefile
@@ -0,0 +1,9 @@
+.PHONY: check clean
+
+check:
+	bats ./run.bats
+
+CLEANDIRS = ./update ./test-chroot ./logs ./.repos ./bundles ./update ./mix-bundles ./clr-bundles ./local ./results ./repodata ./rpms ./upstream-bundles ./local-bundles
+CLEANFILES = ./*.log ./run.bats.trs ./yum.conf.in ./builder.conf ./.{c,m}* *.pem .yum-mix.conf mixversion upstreamurl upstreamversion mixbundles
+clean:
+	sudo rm -rf $(CLEANDIRS) $(CLEANFILES)
diff --git a/bat/tests/04-add-unique-package-to-clear-bundle/description.txt b/bat/tests/04-add-unique-package-to-clear-bundle/description.txt
new file mode 100644
index 0000000..190b68d
--- /dev/null
+++ b/bat/tests/04-add-unique-package-to-clear-bundle/description.txt
@@ -0,0 +1,4 @@
+04-add-unique-package-to-clear-bundle
+=====================================
+This test creates an initial version 10, a version 20 with a unique package
+that does not exist in Clear, and is added to an existing Clear bundle.
diff --git a/bat/tests/04-add-unique-package-to-clear-bundle/run.bats b/bat/tests/04-add-unique-package-to-clear-bundle/run.bats
new file mode 100755
index 0000000..2793832
--- /dev/null
+++ b/bat/tests/04-add-unique-package-to-clear-bundle/run.bats
@@ -0,0 +1,28 @@
+#!/usr/bin/env bats
+
+# shared test functions
+load ../../lib/mixerlib
+
+setup() {
+  setup_builder_conf
+}
+
+@test "Create initial mix 10" {
+  mixer-init-versions $CLRVER 10
+  clean-bundle-dir
+  mixer-build-chroots
+  mixer-create-update
+}
+
+@test "Create version 20 with unique custom bundle added to os-core-update" {
+  localize_builder_conf
+  mixer-init-versions $CLRVER 20
+  download-rpm "ftp://rpmfind.net/linux/fedora-secondary/development/rawhide/source/SRPMS/j/json-c-0.12-7.fc24.src.rpm"
+  mixer-add-rpms
+  add-bundle "os-core-update"
+  add-package "bsdiff" "os-core-update"
+  add-package "json-c" "os-core-update"
+  mixer-build-chroots
+  mixer-create-update > $BATS_TEST_DIRNAME/create_update-20.log
+}
+# vi: ft=sh ts=8 sw=2 sts=2 et tw=80
diff --git a/bat/tests/05-remove-package-from-clear-bundle/Makefile b/bat/tests/05-remove-package-from-clear-bundle/Makefile
new file mode 100755
index 0000000..2ae12ec
--- /dev/null
+++ b/bat/tests/05-remove-package-from-clear-bundle/Makefile
@@ -0,0 +1,9 @@
+.PHONY: check clean
+
+check:
+	bats ./run.bats
+
+CLEANDIRS = ./update ./test-chroot ./logs ./.repos ./bundles ./update ./mix-bundles ./clr-bundles ./local ./results ./repodata ./rpms ./upstream-bundles ./local-bundles
+CLEANFILES = ./*.log ./run.bats.trs ./yum.conf.in ./builder.conf ./.{c,m}* *.pem .yum-mix.conf mixversion upstreamurl upstreamversion mixbundles
+clean:
+	sudo rm -rf $(CLEANDIRS) $(CLEANFILES)
diff --git a/bat/tests/05-remove-package-from-clear-bundle/description.txt b/bat/tests/05-remove-package-from-clear-bundle/description.txt
new file mode 100644
index 0000000..43ed2b6
--- /dev/null
+++ b/bat/tests/05-remove-package-from-clear-bundle/description.txt
@@ -0,0 +1,4 @@
+05-remove-package-from-clear-bundle
+===================================
+This test creates a version 10, then version 20 with the Clear editors bundle
+added, and a version 30 with emacs removed from the editors bundle definition.
diff --git a/bat/tests/05-remove-package-from-clear-bundle/run.bats b/bat/tests/05-remove-package-from-clear-bundle/run.bats
new file mode 100755
index 0000000..044ee8a
--- /dev/null
+++ b/bat/tests/05-remove-package-from-clear-bundle/run.bats
@@ -0,0 +1,33 @@
+#!/usr/bin/env bats
+
+# shared test functions
+load ../../lib/mixerlib
+
+setup() {
+  setup_builder_conf
+}
+
+@test "Create initial mix 10" {
+  mixer-init-versions $CLRVER 10
+  clean-bundle-dir
+  mixer-build-chroots
+  mixer-create-update
+}
+
+@test "Create version 20 with Clear editors bundle added" {
+  mixer-init-versions $CLRVER 20
+  add-bundle "editors"
+  add-package "joe" "editors"
+  add-package "nano" "editors"
+  mixer-build-chroots
+  mixer-create-update > $BATS_TEST_DIRNAME/create_update-20.log
+}
+
+@test "Create version 30 with nano removed from editors bundle" {
+  mixer-init-versions $CLRVER 30
+  remove-package "nano" "editors"
+  mixer-build-chroots
+  mixer-create-update > $BATS_TEST_DIRNAME/create_update-30.log
+}
+
+# vi: ft=sh ts=8 sw=2 sts=2 et tw=80
diff --git a/bat/tests/06-create-mix-with-swapped-clear-packages/Makefile b/bat/tests/06-create-mix-with-swapped-clear-packages/Makefile
new file mode 100755
index 0000000..2ae12ec
--- /dev/null
+++ b/bat/tests/06-create-mix-with-swapped-clear-packages/Makefile
@@ -0,0 +1,9 @@
+.PHONY: check clean
+
+check:
+	bats ./run.bats
+
+CLEANDIRS = ./update ./test-chroot ./logs ./.repos ./bundles ./update ./mix-bundles ./clr-bundles ./local ./results ./repodata ./rpms ./upstream-bundles ./local-bundles
+CLEANFILES = ./*.log ./run.bats.trs ./yum.conf.in ./builder.conf ./.{c,m}* *.pem .yum-mix.conf mixversion upstreamurl upstreamversion mixbundles
+clean:
+	sudo rm -rf $(CLEANDIRS) $(CLEANFILES)
diff --git a/bat/tests/06-create-mix-with-swapped-clear-packages/description.txt b/bat/tests/06-create-mix-with-swapped-clear-packages/description.txt
new file mode 100644
index 0000000..96b2352
--- /dev/null
+++ b/bat/tests/06-create-mix-with-swapped-clear-packages/description.txt
@@ -0,0 +1,4 @@
+06-create-mix-with-swapped-clear-packages
+===================================
+This test creates a version 10, then version 20 with a package swapped between
+os-core and os-core-update.
diff --git a/bat/tests/06-create-mix-with-swapped-clear-packages/run.bats b/bat/tests/06-create-mix-with-swapped-clear-packages/run.bats
new file mode 100755
index 0000000..4fdd852
--- /dev/null
+++ b/bat/tests/06-create-mix-with-swapped-clear-packages/run.bats
@@ -0,0 +1,28 @@
+#!/usr/bin/env bats
+
+# shared test functions
+load ../../lib/mixerlib
+
+setup() {
+  setup_builder_conf
+}
+
+@test "Create initial mix 10" {
+  mixer-init-versions $CLRVER 10
+  clean-bundle-dir
+  add-bundle "os-core-update"
+  add-package "swupd-client" "os-core-update"
+  add-package "bsdiff" "os-core-update"
+  mixer-build-chroots
+  mixer-create-update
+}
+
+@test "Create version 20 with swupd moved from os-core-update into os-core" {
+  mixer-init-versions $CLRVER 20
+  remove-package "swupd-client" "os-core-update"
+  add-package "swupd-client" "os-core"
+  mixer-build-chroots
+  mixer-create-update > $BATS_TEST_DIRNAME/create_update-20.log
+}
+
+# vi: ft=sh ts=8 sw=2 sts=2 et tw=80
diff --git a/bat/tests/07-add-clear-package-to-custom-bundle/Makefile b/bat/tests/07-add-clear-package-to-custom-bundle/Makefile
new file mode 100755
index 0000000..2ae12ec
--- /dev/null
+++ b/bat/tests/07-add-clear-package-to-custom-bundle/Makefile
@@ -0,0 +1,9 @@
+.PHONY: check clean
+
+check:
+	bats ./run.bats
+
+CLEANDIRS = ./update ./test-chroot ./logs ./.repos ./bundles ./update ./mix-bundles ./clr-bundles ./local ./results ./repodata ./rpms ./upstream-bundles ./local-bundles
+CLEANFILES = ./*.log ./run.bats.trs ./yum.conf.in ./builder.conf ./.{c,m}* *.pem .yum-mix.conf mixversion upstreamurl upstreamversion mixbundles
+clean:
+	sudo rm -rf $(CLEANDIRS) $(CLEANFILES)
diff --git a/bat/tests/07-add-clear-package-to-custom-bundle/description.txt b/bat/tests/07-add-clear-package-to-custom-bundle/description.txt
new file mode 100644
index 0000000..b31de6b
--- /dev/null
+++ b/bat/tests/07-add-clear-package-to-custom-bundle/description.txt
@@ -0,0 +1,4 @@
+07-add-clear-package-to-custom-bundle
+====================================
+This test creates a version 10, then version 20 with a Clear package added to
+a custom bundle not included in upstream Clear.
diff --git a/bat/tests/07-add-clear-package-to-custom-bundle/run.bats b/bat/tests/07-add-clear-package-to-custom-bundle/run.bats
new file mode 100755
index 0000000..3647fee
--- /dev/null
+++ b/bat/tests/07-add-clear-package-to-custom-bundle/run.bats
@@ -0,0 +1,29 @@
+#!/usr/bin/env bats
+
+# shared test functions
+load ../../lib/mixerlib
+
+setup() {
+  setup_builder_conf
+}
+
+@test "Create initial mix 10" {
+  mixer-init-versions $CLRVER 10
+  clean-bundle-dir
+  add-bundle "os-core-update"
+  add-package "bsdiff" "os-core-update"
+  add-package "swupd" "os-core-update"
+  mixer-build-chroots
+  mixer-create-update
+}
+
+@test "Create version 20 with swupd moved from os-core-update into custom testbundle" {
+  mixer-init-versions $CLRVER 20
+  remove-package "swupd-client" "os-core-update"
+  add-bundle "testbundle"
+  add-package "swupd-client" "testbundle"
+  mixer-build-chroots
+  mixer-create-update > $BATS_TEST_DIRNAME/create_update-20.log
+}
+
+# vi: ft=sh ts=8 sw=2 sts=2 et tw=80
diff --git a/bat/tests/08-test-format-bump/Makefile b/bat/tests/08-test-format-bump/Makefile
new file mode 100755
index 0000000..2ae12ec
--- /dev/null
+++ b/bat/tests/08-test-format-bump/Makefile
@@ -0,0 +1,9 @@
+.PHONY: check clean
+
+check:
+	bats ./run.bats
+
+CLEANDIRS = ./update ./test-chroot ./logs ./.repos ./bundles ./update ./mix-bundles ./clr-bundles ./local ./results ./repodata ./rpms ./upstream-bundles ./local-bundles
+CLEANFILES = ./*.log ./run.bats.trs ./yum.conf.in ./builder.conf ./.{c,m}* *.pem .yum-mix.conf mixversion upstreamurl upstreamversion mixbundles
+clean:
+	sudo rm -rf $(CLEANDIRS) $(CLEANFILES)
diff --git a/bat/tests/08-test-format-bump/description.txt b/bat/tests/08-test-format-bump/description.txt
new file mode 100644
index 0000000..b277a51
--- /dev/null
+++ b/bat/tests/08-test-format-bump/description.txt
@@ -0,0 +1,6 @@
+11-test-format-bump
+===================
+This test simulates a format bump change by creating an initial version 10,
+a version 20 with a new bundle and package inside of-it, version 30 with
+that package deleted from the bundle, version 40 with the format bumped +1,
+then 50 and 60 updates built with new (locally cloned) swupd server code.
diff --git a/bat/tests/08-test-format-bump/run.bats b/bat/tests/08-test-format-bump/run.bats
new file mode 100755
index 0000000..5fd6945
--- /dev/null
+++ b/bat/tests/08-test-format-bump/run.bats
@@ -0,0 +1,9 @@
+#!/usr/bin/env bats
+
+# shared test functions
+load ../../lib/mixerlib
+
+@test "Create initial mix 10" {
+}
+
+# vi: ft=sh ts=8 sw=2 sts=2 et tw=80