Skip to content

Commit

Permalink
spelling fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
abbbi committed Nov 15, 2023
1 parent 4072c4e commit 8be1cb1
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 19 deletions.
1 change: 1 addition & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Version 1.9.46
---------
* Update package dependencies in docker file.
* Spelling fixes

Version 1.9.45
---------
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG source="https://github.com/abbbi/virtnbdbackup"

LABEL container.name="virtnbdbackup-docker"
LABEL container.source.description="Backup utiliy for Libvirt kvm / qemu with Incremental backup support via NBD"
LABEL container.description="virtnbdbackup and virtnbdrestore (plus depedencies) to run on hosts with libvirt >= 6.0.0"
LABEL container.description="virtnbdbackup and virtnbdrestore (plus dependencies) to run on hosts with libvirt >= 6.0.0"
LABEL container.source=$source
LABEL container.version="1.1"
LABEL maintainer="Michael Ablassmeier <[email protected]>"
Expand Down
6 changes: 3 additions & 3 deletions docker/README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
## Overwiew:
## Overview:

This dockerfile is intended for scenarios where isn't viable for SysAdmins to
provide a up-to-date dependencies (stable distros); or when this is totally
impossible due to system constraints (inmutable / embedded rootfs, docker
oriented OSes, etc.)

This image includes 'virtnbdbackup' and 'virtnbdrestore' utils installed along
with required dependecies, and currently is being built from
with required dependencies, and currently is being built from
`debian:bullseye-slim` as base.

It has been successfully tested on UnRaid v6.9.2, but should work the same on
Expand Down Expand Up @@ -98,7 +98,7 @@ device name, such as 'sda', 'vda', 'hdc', etc.
### Persistent container:
In the above examples, the container will be removed as soon the invoked
command has been executed. This is the optimal behaviour when you intend to
automatize operations (such as incremental backups.)
automate operations (such as incremental backups.)

In addition, you can set a persistent container with all necessary bind mounts
with:
Expand Down
30 changes: 15 additions & 15 deletions t/tests.bats
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ toOut() {
[ -e "${TMPDIR}/inctest/sda.virtnbdbackup.0.qcow.json" ]
[ -e "${TMPDIR}/inctest/sda.full.data" ]
}
@test "Backup: incremental and differencial backup must fail if partial file found" {
@test "Backup: incremental and differential backup must fail if partial file found" {
[ -z $INCTEST ] && skip "skipping"
touch ${TMPDIR}/inctest/sda.partial

Expand Down Expand Up @@ -528,33 +528,33 @@ toOut() {
}
# differencial backup
# differential backup
@test "Differencial Setup: Prepare test for differencial backup" {
@test "Differential Setup: Prepare test for differential backup" {
[ -z $INCTEST ] && skip "skipping"
command -v guestmount || exit 1
rm -rf ${TMPDIR}/difftest
}
@test "Differencial Backup: differencial backup must fail without any checkpoints" {
@test "Differential Backup: differential backup must fail without any checkpoints" {
[ -z $INCTEST ] && skip "skipping"
run ../virtnbdbackup -d $VM -l diff -o ${TMPDIR}/difftest
echo "output = ${output}"
[ "$status" -eq 1 ]
rm -rf ${TMPDIR}/difftest
}
@test "Differencial Backup: create full backup" {
@test "Differential Backup: create full backup" {
[ -z $INCTEST ] && skip "skipping"
run ../virtnbdbackup -d $VM -l full -o ${TMPDIR}/difftest
echo "output = ${output}"
[ "$status" -eq 0 ]
}
@test "Differencial Setup: destroy VM" {
@test "Differential Setup: destroy VM" {
[ -z $INCTEST ] && skip "skipping"
run virsh destroy $VM
echo "output = ${output}"
[ "$status" -eq 0 ]
}
@test "Differencial Setup: mount disk via guestmount and create file" {
@test "Differential Setup: mount disk via guestmount and create file" {
[ -z $INCTEST ] && skip "skipping"
mkdir -p /empty
run guestmount -d $VM -m /dev/sda1 /empty/
Expand All @@ -565,26 +565,26 @@ toOut() {
echo "output = ${output}"
[ "$status" -eq 0 ]
}
@test "Differencial Setup: start VM after creating file" {
@test "Differential Setup: start VM after creating file" {
[ -z $INCTEST ] && skip "skipping"
sleep 5 # not sure why..
run virsh start $VM
echo "output = ${output}"
[ "$status" -eq 0 ]
}
@test "Differencial Backup: create first differencial backup" {
@test "Differential Backup: create first differential backup" {
[ -z $INCTEST ] && skip "skipping"
run ../virtnbdbackup -d $VM -l inc -o ${TMPDIR}/difftest
echo "output = ${output}"
[ "$status" -eq 0 ]
}
@test "Differencial Setup: destroy VM again" {
@test "Differential Setup: destroy VM again" {
[ -z $INCTEST ] && skip "skipping"
run virsh destroy $VM
echo "output = ${output}"
[ "$status" -eq 0 ]
}
@test "Differencial Setup: mount disk via guestmount and create second file" {
@test "Differential Setup: mount disk via guestmount and create second file" {
[ -z $INCTEST ] && skip "skipping"
mkdir -p /empty
run guestmount -d $VM -m /dev/sda1 /empty/
Expand All @@ -595,20 +595,20 @@ toOut() {
echo "output = ${output}"
[ "$status" -eq 0 ]
}
@test "Differencial Setup: start VM after creating second file" {
@test "Differential Setup: start VM after creating second file" {
[ -z $INCTEST ] && skip "skipping"
sleep 5 # not sure why..
run virsh start $VM
echo "output = ${output}"
[ "$status" -eq 0 ]
}
@test "Differencial Backup: create second differencial backup" {
@test "Differential Backup: create second differential backup" {
[ -z $INCTEST ] && skip "skipping"
run ../virtnbdbackup -d $VM -l inc -o ${TMPDIR}/difftest
echo "output = ${output}"
[ "$status" -eq 0 ]
}
@test "Differencial Restore: restore data and check if both files from differencial backup exists" {
@test "Differential Restore: restore data and check if both files from differential backup exists" {
[ -z $INCTEST ] && skip "skipping"
rm -rf ${TMPDIR}/RESTOREINC/
run ../virtnbdrestore -i ${TMPDIR}/difftest/ -o ${TMPDIR}/RESTOREDIFF/
Expand Down Expand Up @@ -688,7 +688,7 @@ toOut() {
[ "$status" -eq 0 ]
}
@test "Map: Map full backup to nbd block device, check device size and partitions, mount filesystem" {
[ -f /.dockerenv ] && skip "wont work inside docker image"
[ -f /.dockerenv ] && skip "won't work inside docker image"
[ -z $MAPTEST ] && skip "skipping"
[ ! -z $GITHUB_JOB ] && skip "on github ci"
modprobe nbd max_partitions=1 || true
Expand Down

0 comments on commit 8be1cb1

Please sign in to comment.