root
/
buildah
mirror of https://github.com/containers/buildah.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity
buildah/tests/basic.bats

145 lines
4.6 KiB
Plaintext
Raw Normal View History

Add some integration tests Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-07 07:11:40 +08:00
#!/usr/bin/env bats
load helpers
@test "from" {
Flake handling: cache and prefetch images Show of hands: who here loves submitting a PR, then coming back hours later to find one job failed, then spending time poring over logs and finding a network error? Anyone? Anyone? This is a lame attempt to minimize such flakes by caching commonly-used images and restoring them on demand. We introduce a new helper, _prefetch(), which podman-pulls an image the first time, podman-saves it, then on subsequent calls (for the same image) podman-loads it: @test foo { _prefetch alpine busybox ...tests that run buildah-from either } This is an imperfect solution: it is incomplete and will grow more so over time as new tests are added. It is difficult to verify its coverage. I'm really unhappy with it but if it works, the Total Sum Of Unhappiness might decrease overall thanks to fewer flakes. If it doesn't work, it's trivial to remove _prefetch calls using a sed script. Shall we give it a chance? Signed-off-by: Ed Santiago <santiago@redhat.com>
2019-12-09 21:45:52 +08:00
_prefetch alpine
Rename $TESTSDIR (the plural one), step 1 of 3 ...refactor '--signature-policy .../policy.json' to $WITH_POLICY_JSON Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 21:47:03 +08:00
run_buildah from --quiet --pull=false $WITH_POLICY_JSON alpine
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
cid=$output
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah rm $cid
Rename $TESTSDIR (the plural one), step 1 of 3 ...refactor '--signature-policy .../policy.json' to $WITH_POLICY_JSON Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 21:47:03 +08:00
run_buildah from $WITH_POLICY_JSON scratch
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
cid=$output
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah rm $cid
Rename $TESTSDIR (the plural one), step 1 of 3 ...refactor '--signature-policy .../policy.json' to $WITH_POLICY_JSON Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 21:47:03 +08:00
run_buildah from --quiet --pull=false $WITH_POLICY_JSON --name i-love-naming-things alpine
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
cid=$output
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah rm i-love-naming-things
Pull required flag values from the arguments list When flags that we'd require be specified aren't, if there are command line arguments, use their values as flag values. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-18 05:46:21 +08:00
}
@test "from-defaultpull" {
Flake handling: cache and prefetch images Show of hands: who here loves submitting a PR, then coming back hours later to find one job failed, then spending time poring over logs and finding a network error? Anyone? Anyone? This is a lame attempt to minimize such flakes by caching commonly-used images and restoring them on demand. We introduce a new helper, _prefetch(), which podman-pulls an image the first time, podman-saves it, then on subsequent calls (for the same image) podman-loads it: @test foo { _prefetch alpine busybox ...tests that run buildah-from either } This is an imperfect solution: it is incomplete and will grow more so over time as new tests are added. It is difficult to verify its coverage. I'm really unhappy with it but if it works, the Total Sum Of Unhappiness might decrease overall thanks to fewer flakes. If it doesn't work, it's trivial to remove _prefetch calls using a sed script. Shall we give it a chance? Signed-off-by: Ed Santiago <santiago@redhat.com>
2019-12-09 21:45:52 +08:00
_prefetch alpine
Rename $TESTSDIR (the plural one), step 1 of 3 ...refactor '--signature-policy .../policy.json' to $WITH_POLICY_JSON Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 21:47:03 +08:00
run_buildah from --quiet $WITH_POLICY_JSON alpine
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
cid=$output
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah rm $cid
Pull required flag values from the arguments list When flags that we'd require be specified aren't, if there are command line arguments, use their values as flag values. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-18 05:46:21 +08:00
}
Use "scratch" for tests where we never "run" We can use "scratch" now as a source for building images, so speed things up a bit by using it instead of pulling alpine in tests where it isn't expected to affect the test result. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> Closes: #55 Approved by: rhatdan
2017-03-29 05:38:15 +08:00
@test "from-scratch" {
Rename $TESTSDIR (the plural one), step 1 of 3 ...refactor '--signature-policy .../policy.json' to $WITH_POLICY_JSON Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 21:47:03 +08:00
run_buildah from --pull=false $WITH_POLICY_JSON scratch
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
cid=$output
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah rm $cid
Rename $TESTSDIR (the plural one), step 1 of 3 ...refactor '--signature-policy .../policy.json' to $WITH_POLICY_JSON Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 21:47:03 +08:00
run_buildah from --pull=true $WITH_POLICY_JSON scratch
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
cid=$output
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah rm $cid
Use "scratch" for tests where we never "run" We can use "scratch" now as a source for building images, so speed things up a bit by using it instead of pulling alpine in tests where it isn't expected to affect the test result. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> Closes: #55 Approved by: rhatdan
2017-03-29 05:38:15 +08:00
}
Pull required flag values from the arguments list When flags that we'd require be specified aren't, if there are command line arguments, use their values as flag values. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-18 05:46:21 +08:00
@test "from-nopull" {
Rename $TESTSDIR (the plural one), step 1 of 3 ...refactor '--signature-policy .../policy.json' to $WITH_POLICY_JSON Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 21:47:03 +08:00
run_buildah 125 from --pull-never $WITH_POLICY_JSON alpine
Add some integration tests Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-07 07:11:40 +08:00
}
@test "mount" {
Rename $TESTSDIR (the plural one), step 1 of 3 ...refactor '--signature-policy .../policy.json' to $WITH_POLICY_JSON Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 21:47:03 +08:00
run_buildah from $WITH_POLICY_JSON scratch
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
cid=$output
run_buildah mount $cid
root=$output
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah unmount $cid
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
run_buildah mount $cid
root=$output
Add some more options for Run Add options to Run() for passing in additional environment variables, overriding the default command, user, and working directory, and a flag for controlling whether or not we attach to the host's network. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> Closes: #46 Approved by: rhatdan Closes: #39 Approved by: nalind
2017-03-28 02:46:35 +08:00
touch $root/foobar
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah unmount $cid
run_buildah rm $cid
Add some integration tests Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-07 07:11:40 +08:00
}
Test looking up containers by name and root Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-16 05:25:05 +08:00
@test "by-name" {
Rename $TESTSDIR (the plural one), step 1 of 3 ...refactor '--signature-policy .../policy.json' to $WITH_POLICY_JSON Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 21:47:03 +08:00
run_buildah from $WITH_POLICY_JSON --name scratch-working-image-for-test scratch
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
cid=$output
run_buildah mount scratch-working-image-for-test
root=$output
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah unmount scratch-working-image-for-test
run_buildah rm scratch-working-image-for-test
Test looking up containers by name and root Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-16 05:25:05 +08:00
}
Add some integration tests Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-07 07:11:40 +08:00
@test "commit" {
Rename $TESTSDIR (the plural one), step 4 of 3 ...rename $TESTDIR (the singular one) to $TEST_SCRATCH_DIR, which is clearer but unfortunately longer Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 23:09:11 +08:00
createrandom ${TEST_SCRATCH_DIR}/randomfile
createrandom ${TEST_SCRATCH_DIR}/other-randomfile
Add some integration tests Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-07 07:11:40 +08:00
Rename $TESTSDIR (the plural one), step 1 of 3 ...refactor '--signature-policy .../policy.json' to $WITH_POLICY_JSON Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 21:47:03 +08:00
run_buildah from $WITH_POLICY_JSON scratch
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
cid=$output
run_buildah mount $cid
root=$output
Rename $TESTSDIR (the plural one), step 4 of 3 ...rename $TESTDIR (the singular one) to $TEST_SCRATCH_DIR, which is clearer but unfortunately longer Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 23:09:11 +08:00
cp ${TEST_SCRATCH_DIR}/randomfile $root/randomfile
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah unmount $cid
Rename $TESTSDIR (the plural one), step 4 of 3 ...rename $TESTDIR (the singular one) to $TEST_SCRATCH_DIR, which is clearer but unfortunately longer Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 23:09:11 +08:00
run_buildah commit --iidfile ${TEST_SCRATCH_DIR}/output.iid $WITH_POLICY_JSON $cid containers-storage:new-image
iid=$(< ${TEST_SCRATCH_DIR}/output.iid)
Don't pollute Several tests were doing '--iidfile x', where 'x' is a filename with no path. This is super bad: if running as root, it leaves litter in the current directory. If rootless, it may throw EPERM. Clean those up, using $TESTDIR for each one. Tested by running the test suite on my laptop and confirming there are no more droppings. And, refactor one particularly hairy set of duplicated build incantations: make them a series of simple clean loops. Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-03-23 23:42:51 +08:00
assert "$iid" =~ "sha256:[0-9a-f]{64}"
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah rmi $iid
Rename $TESTSDIR (the plural one), step 1 of 3 ...refactor '--signature-policy .../policy.json' to $WITH_POLICY_JSON Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 21:47:03 +08:00
run_buildah commit $WITH_POLICY_JSON $cid containers-storage:new-image
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah rm $cid
Rename $TESTSDIR (the plural one), step 1 of 3 ...refactor '--signature-policy .../policy.json' to $WITH_POLICY_JSON Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 21:47:03 +08:00
run_buildah from --quiet $WITH_POLICY_JSON new-image
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
newcid=$output
run_buildah mount $newcid
newroot=$output
Remove all --name and --root options Also fix up buildah commit to require name and image
2017-03-25 00:49:22 +08:00
test -s $newroot/randomfile
Rename $TESTSDIR (the plural one), step 4 of 3 ...rename $TESTDIR (the singular one) to $TEST_SCRATCH_DIR, which is clearer but unfortunately longer Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 23:09:11 +08:00
cmp ${TEST_SCRATCH_DIR}/randomfile $newroot/randomfile
cp ${TEST_SCRATCH_DIR}/other-randomfile $newroot/other-randomfile
Rename $TESTSDIR (the plural one), step 1 of 3 ...refactor '--signature-policy .../policy.json' to $WITH_POLICY_JSON Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 21:47:03 +08:00
run_buildah commit $WITH_POLICY_JSON $newcid containers-storage:other-new-image
Remove all --name and --root options Also fix up buildah commit to require name and image
2017-03-25 00:49:22 +08:00
# Not an allowed ordering of arguments and flags. Check that it's rejected.
Rename $TESTSDIR (the plural one), step 1 of 3 ...refactor '--signature-policy .../policy.json' to $WITH_POLICY_JSON Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 21:47:03 +08:00
run_buildah 125 commit $newcid $WITH_POLICY_JSON containers-storage:rejected-new-image
run_buildah commit $WITH_POLICY_JSON $newcid containers-storage:another-new-image
run_buildah commit $WITH_POLICY_JSON $newcid yet-another-new-image
run_buildah commit $WITH_POLICY_JSON $newcid containers-storage:gratuitous-new-image
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah unmount $newcid
run_buildah rm $newcid
Add some integration tests Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-07 07:11:40 +08:00
Rename $TESTSDIR (the plural one), step 1 of 3 ...refactor '--signature-policy .../policy.json' to $WITH_POLICY_JSON Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 21:47:03 +08:00
run_buildah from --quiet $WITH_POLICY_JSON other-new-image
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
othernewcid=$output
run_buildah mount $othernewcid
othernewroot=$output
Remove all --name and --root options Also fix up buildah commit to require name and image
2017-03-25 00:49:22 +08:00
test -s $othernewroot/randomfile
Rename $TESTSDIR (the plural one), step 4 of 3 ...rename $TESTDIR (the singular one) to $TEST_SCRATCH_DIR, which is clearer but unfortunately longer Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 23:09:11 +08:00
cmp ${TEST_SCRATCH_DIR}/randomfile $othernewroot/randomfile
Remove all --name and --root options Also fix up buildah commit to require name and image
2017-03-25 00:49:22 +08:00
test -s $othernewroot/other-randomfile
Rename $TESTSDIR (the plural one), step 4 of 3 ...rename $TESTDIR (the singular one) to $TEST_SCRATCH_DIR, which is clearer but unfortunately longer Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 23:09:11 +08:00
cmp ${TEST_SCRATCH_DIR}/other-randomfile $othernewroot/other-randomfile
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah rm $othernewcid
Pull required flag values from the arguments list When flags that we'd require be specified aren't, if there are command line arguments, use their values as flag values. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-18 05:46:21 +08:00
Rename $TESTSDIR (the plural one), step 1 of 3 ...refactor '--signature-policy .../policy.json' to $WITH_POLICY_JSON Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 21:47:03 +08:00
run_buildah from --quiet $WITH_POLICY_JSON another-new-image
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
anothernewcid=$output
run_buildah mount $anothernewcid
anothernewroot=$output
Remove all --name and --root options Also fix up buildah commit to require name and image
2017-03-25 00:49:22 +08:00
test -s $anothernewroot/randomfile
Rename $TESTSDIR (the plural one), step 4 of 3 ...rename $TESTDIR (the singular one) to $TEST_SCRATCH_DIR, which is clearer but unfortunately longer Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 23:09:11 +08:00
cmp ${TEST_SCRATCH_DIR}/randomfile $anothernewroot/randomfile
Remove all --name and --root options Also fix up buildah commit to require name and image
2017-03-25 00:49:22 +08:00
test -s $anothernewroot/other-randomfile
Rename $TESTSDIR (the plural one), step 4 of 3 ...rename $TESTDIR (the singular one) to $TEST_SCRATCH_DIR, which is clearer but unfortunately longer Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 23:09:11 +08:00
cmp ${TEST_SCRATCH_DIR}/other-randomfile $anothernewroot/other-randomfile
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah rm $anothernewcid
Pull required flag values from the arguments list When flags that we'd require be specified aren't, if there are command line arguments, use their values as flag values. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-18 05:46:21 +08:00
Rename $TESTSDIR (the plural one), step 1 of 3 ...refactor '--signature-policy .../policy.json' to $WITH_POLICY_JSON Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 21:47:03 +08:00
run_buildah from --quiet $WITH_POLICY_JSON yet-another-new-image
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
yetanothernewcid=$output
run_buildah mount $yetanothernewcid
yetanothernewroot=$output
Remove all --name and --root options Also fix up buildah commit to require name and image
2017-03-25 00:49:22 +08:00
test -s $yetanothernewroot/randomfile
Rename $TESTSDIR (the plural one), step 4 of 3 ...rename $TESTDIR (the singular one) to $TEST_SCRATCH_DIR, which is clearer but unfortunately longer Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 23:09:11 +08:00
cmp ${TEST_SCRATCH_DIR}/randomfile $yetanothernewroot/randomfile
Remove all --name and --root options Also fix up buildah commit to require name and image
2017-03-25 00:49:22 +08:00
test -s $yetanothernewroot/other-randomfile
Rename $TESTSDIR (the plural one), step 4 of 3 ...rename $TESTDIR (the singular one) to $TEST_SCRATCH_DIR, which is clearer but unfortunately longer Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 23:09:11 +08:00
cmp ${TEST_SCRATCH_DIR}/other-randomfile $yetanothernewroot/other-randomfile
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah delete $yetanothernewcid
Broaden what "rmi" can accept, and add tests Teach "rmi" to handle arbitrary image references and incomplete references, and add tests for both. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> Closes: #61 Approved by: rhatdan
2017-03-29 05:08:37 +08:00
Rename $TESTSDIR (the plural one), step 1 of 3 ...refactor '--signature-policy .../policy.json' to $WITH_POLICY_JSON Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 21:47:03 +08:00
run_buildah from --quiet $WITH_POLICY_JSON new-image
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
newcid=$output
Rename $TESTSDIR (the plural one), step 1 of 3 ...refactor '--signature-policy .../policy.json' to $WITH_POLICY_JSON Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-26 21:47:03 +08:00
run_buildah commit --rm $WITH_POLICY_JSON $newcid containers-storage:remove-container-image
Return exit code from failed containers Buildah run was exiting with the correct exit code, when a container failed. Buildah bud was not, so this should fix this. Also switched to the proper exit codes when containers fail. When Buildah fails to execute it will exit with a 125 exit code like Podman does. If a command fails to execute inside of a container we will exit with a 126. Currently we do not support the 127 for exiting when the command does not exist. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-04-16 21:48:43 +08:00
run_buildah 125 mount $newcid
Add flag to remove containers on commit I think this would be good practice to eliminate wasted disk space. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Signed-off-by: Dan Walsh <dwalsh@redhat.com> Closes: #189 Approved by: rhatdan
2017-07-14 20:57:26 +08:00
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah rmi remove-container-image
run_buildah rmi containers-storage:other-new-image
run_buildah rmi another-new-image
BATS major cleanup, part 1: log-level PR #1935 removed the default --debug logging; so all run_buildah calls now use the default (error). It is safe to remove unnecessary instances of --log-level=error . For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's/ --log-level=error / /' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 02:28:27 +08:00
run_buildah images -q
system tests: remove unhelpful assertions Regular primitive bats uses assertions like '[ $foo = something ]'. These are worthless for debugging: when they fail, all you know is that foo is not "something" but you don't know what foo _is_. Find and replace those assertions with 'assert', which is more informative. Instances found via: $ ack '^ *\[' tests/*.bats There are many matches for 'test' (instead of '[') but those mostly look like file-existence ones, which are less evil than string-check tests. I'm leaving those be for now. Signed-off-by: Ed Santiago <santiago@redhat.com>
2023-01-05 21:42:11 +08:00
assert "$output" != "" "images -q"
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah rmi -a
BATS major cleanup, part 1: log-level PR #1935 removed the default --debug logging; so all run_buildah calls now use the default (error). It is safe to remove unnecessary instances of --log-level=error . For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's/ --log-level=error / /' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 02:28:27 +08:00
run_buildah images -q
rename 'is' to 'expect_output' ...and make the "$output" argument implicit, as well as the description text. This greatly simplifies its invocation. Also: make it test for exact matches unless --substring option is passed; this eases my mind about a few potentially ambiguous situations such as the one in #1464. Also: add comments to two truth-table check functions Also: reorder some config checks alphabetically, for ease of reading. Thanks to Tom Sweeney for the suggestions and encouragement. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1492 Approved by: rhatdan
2019-04-05 23:59:54 +08:00
expect_output ""
Add some integration tests Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-07 07:11:40 +08:00
}
[release-1.33] Add conditional release-checking system test Unfortunately on a number of occasions, Buildah has been released officially with a `-dev` suffix in the version number. Assist in catching this mistake at release time by the addition of a simple conditional test. Note that it must be positively enabled by a magic env. var. before executing the system tests. Ref: original PR https://github.com/containers/buildah/pull/6243 Signed-off-by: Chris Evich <cevich@redhat.com>
2025-07-03 03:20:07 +08:00
@test "release" {
[[ "${RELEASE_TESTING:-false}" == "true" ]] || \
skip "Release testing may be enabled by setting \$RELEASE_TESTING = 'true'."
run_buildah --version
assert "$output" "!~" "dev" "The Buildah version string does not mention 'dev'."
}