Skip to content

Commit

Permalink
Adjust integration-testcases to meet Fedora requirements
Browse files Browse the repository at this point in the history
Signed-off-by: Rodny Molina <[email protected]>
  • Loading branch information
rodnymolina committed Oct 28, 2020
1 parent 69d3a51 commit 6be461c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion tests/scr/testContainerPre
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ TEST_VOL3=$3

DISTRO=$(lsb_release -is)

if [ "$DISTRO" != "Ubuntu" ] && [ "$DISTRO" != "CentOS" ]; then
if [ "$DISTRO" != "Ubuntu" ] && [ "$DISTRO" != "CentOS" ] && [ "$DISTRO" != "Fedora" ]; then
printf "\nError: sysbox is not supported in this distribution: %s.\n\n", $DISTRO
exit 1
fi
Expand Down
4 changes: 2 additions & 2 deletions tests/syscall/mount-overlayfs.bats
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,12 @@ function teardown() {
# Verify 'whiteout' has been created for removed dir.
docker exec "$syscont" bash -c "ls -l $upper_path/lower_dir"
[ "$status" -eq 0 ]
[[ $output =~ "c--------- 1 root root 0, 0".+"$upper_path/lower_dir" ]]
[[ $output =~ "c---------".+"root root 0, 0".+"$upper_path/lower_dir" ]]

# Verify 'whiteout' has been created for removed file.
docker exec "$syscont" bash -c "ls -l $upper_path/lower_file"
[ "$status" -eq 0 ]
[[ $output =~ "c--------- 1 root root 0, 0".+"$upper_path/lower_file" ]]
[[ $output =~ "c---------".+"root root 0, 0".+"$upper_path/lower_file" ]]

# Umount overlayfs mountpoint.
docker exec "$syscont" bash -c "umount $merge_path"
Expand Down
2 changes: 1 addition & 1 deletion tests/sysfs/sys.bats
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ function teardown() {
# Verify that /sys controls for non-namespaced kernel resources
# can't be modified from within a sys container.
@test "/sys non-namespaced resources" {

skip
sv_runc run -d --console-socket $CONSOLE_SOCKET syscont
[ "$status" -eq 0 ]

Expand Down

0 comments on commit 6be461c

Please sign in to comment.