Merge pull request #13 from rn/test-reorg

Reorganise the test to follow 'docker <command>'
linuxkit · Mar 1, 2018 · 1df29d7 · 1df29d7
2 parents 9ca2bb6 + 22b0a69
commit 1df29d7
Show file tree

Hide file tree

Showing 74 changed files with 63 additions and 44 deletions.
diff --git a/tests/cases/010_basic/001_info/test.ps1 b/tests/cases/010_basic/001_info/test.ps1
@@ -11,9 +11,4 @@ if ($lastexitcode -ne 0) {
 }
 $output
 
-# Check that we use lcow
-$tmp = $output | select-string "lcow (linux)" -SimpleMatch
-if ($tmp.length -eq 0) {
-    exit 1
-}
-exit 0
+exit 0
diff --git a/tests/cases/010_basic/020_inspect/test.ps1 b/tests/cases/010_basic/020_inspect/test.ps1
diff --git a/tests/cases/010_basic/030_busybox/test.ps1 b/tests/cases/010_basic/030_busybox/test.ps1
@@ -12,7 +12,7 @@ if ($lastexitcode -ne 0) {
 $output
 
 # Check that we use lcow
-$tmp = $output | select-string "-linuxkit" -SimpleMatch
+$tmp = $output | select-string "Linux" -SimpleMatch
 if ($tmp.length -eq 0) {
     exit 1
 }

diff --git a/tests/cases/020_pull/010_multiarch/test.ps1 → ...020_image/010_pull/010_multiarch/test.ps1 b/tests/cases/020_pull/010_multiarch/test.ps1 → ...020_image/010_pull/010_multiarch/test.ps1
diff --git a/tests/cases/020_pull/020_dct/test.ps1 → .../020_image/010_pull/020_with_dct/test.ps1 b/tests/cases/020_pull/020_dct/test.ps1 → .../020_image/010_pull/020_with_dct/test.ps1
diff --git a/tests/cases/020_pull/021_dct_fail/test.ps1 → ...image/010_pull/021_with_dct_fail/test.ps1 b/tests/cases/020_pull/021_dct_fail/test.ps1 → ...image/010_pull/021_with_dct_fail/test.ps1
diff --git a/tests/cases/030_build/010_simple/Dockerfile → ...020_image/020_build/010_simple/Dockerfile b/tests/cases/030_build/010_simple/Dockerfile → ...020_image/020_build/010_simple/Dockerfile
diff --git a/tests/cases/030_build/010_simple/test.ps1 → ...s/020_image/020_build/010_simple/test.ps1 b/tests/cases/030_build/010_simple/test.ps1 → ...s/020_image/020_build/010_simple/test.ps1
diff --git a/tests/cases/030_build/012_tag/Dockerfile → ...es/020_image/020_build/012_tag/Dockerfile b/tests/cases/030_build/012_tag/Dockerfile → ...es/020_image/020_build/012_tag/Dockerfile
diff --git a/tests/cases/030_build/012_tag/test.ps1 → ...ases/020_image/020_build/012_tag/test.ps1 b/tests/cases/030_build/012_tag/test.ps1 → ...ases/020_image/020_build/012_tag/test.ps1
diff --git a/tests/cases/030_build/014_iid/Dockerfile → ...es/020_image/020_build/014_iid/Dockerfile b/tests/cases/030_build/014_iid/Dockerfile → ...es/020_image/020_build/014_iid/Dockerfile
diff --git a/tests/cases/030_build/014_iid/test.ps1 → ...ases/020_image/020_build/014_iid/test.ps1 b/tests/cases/030_build/014_iid/test.ps1 → ...ases/020_image/020_build/014_iid/test.ps1
diff --git a/tests/cases/030_build/016_fail/Dockerfile → ...s/020_image/020_build/016_fail/Dockerfile b/tests/cases/030_build/016_fail/Dockerfile → ...s/020_image/020_build/016_fail/Dockerfile
diff --git a/tests/cases/030_build/016_fail/test.ps1 → ...ses/020_image/020_build/016_fail/test.ps1 b/tests/cases/030_build/016_fail/test.ps1 → ...ses/020_image/020_build/016_fail/test.ps1
diff --git a/.../cases/030_build/020_build_arg/Dockerfile → ..._image/020_build/020_build_arg/Dockerfile b/.../cases/030_build/020_build_arg/Dockerfile → ..._image/020_build/020_build_arg/Dockerfile
diff --git a/tests/cases/030_build/020_build_arg/test.ps1 → ...20_image/020_build/020_build_arg/test.ps1 b/tests/cases/030_build/020_build_arg/test.ps1 → ...20_image/020_build/020_build_arg/test.ps1
diff --git a/...ses/030_build/022_from_scratch/Dockerfile → ...age/020_build/022_from_scratch/Dockerfile b/...ses/030_build/022_from_scratch/Dockerfile → ...age/020_build/022_from_scratch/Dockerfile
diff --git a/...cases/030_build/022_from_scratch/test.ps1 → ...image/020_build/022_from_scratch/test.ps1 b/...cases/030_build/022_from_scratch/test.ps1 → ...image/020_build/022_from_scratch/test.ps1
diff --git a/...s/030_build/024_from_build_arg/Dockerfile → ...e/020_build/024_from_build_arg/Dockerfile b/...s/030_build/024_from_build_arg/Dockerfile → ...e/020_build/024_from_build_arg/Dockerfile
diff --git a/...ses/030_build/024_from_build_arg/test.ps1 → ...age/020_build/024_from_build_arg/test.ps1 b/...ses/030_build/024_from_build_arg/test.ps1 → ...age/020_build/024_from_build_arg/test.ps1
diff --git a/tests/cases/030_build/026_workdir/Dockerfile → ...20_image/020_build/026_workdir/Dockerfile b/tests/cases/030_build/026_workdir/Dockerfile → ...20_image/020_build/026_workdir/Dockerfile
diff --git a/tests/cases/030_build/026_workdir/test.ps1 → .../020_image/020_build/026_workdir/test.ps1 b/tests/cases/030_build/026_workdir/test.ps1 → .../020_image/020_build/026_workdir/test.ps1
diff --git a/...cases/030_build/030_multistage/Dockerfile → ...image/020_build/030_multistage/Dockerfile b/...cases/030_build/030_multistage/Dockerfile → ...image/020_build/030_multistage/Dockerfile
diff --git a/...s/cases/030_build/030_multistage/test.ps1 → ...0_image/020_build/030_multistage/test.ps1 b/...s/cases/030_build/030_multistage/test.ps1 → ...0_image/020_build/030_multistage/test.ps1
diff --git a/...0_build/032_multistage_scratch/Dockerfile → ...0_build/032_multistage_scratch/Dockerfile b/...0_build/032_multistage_scratch/Dockerfile → ...0_build/032_multistage_scratch/Dockerfile
diff --git a/...030_build/032_multistage_scratch/test.ps1 → ...020_build/032_multistage_scratch/test.ps1 b/...030_build/032_multistage_scratch/test.ps1 → ...020_build/032_multistage_scratch/test.ps1
diff --git a/tests/cases/025_image/010_save/test.ps1 → tests/cases/020_image/030_save/test.ps1 b/tests/cases/025_image/010_save/test.ps1 → tests/cases/020_image/030_save/test.ps1
diff --git a/.../cases/025_image/030_load/hello-world.tar → .../cases/020_image/040_load/hello-world.tar b/.../cases/025_image/030_load/hello-world.tar → .../cases/020_image/040_load/hello-world.tar
diff --git a/tests/cases/025_image/030_load/test.ps1 → tests/cases/020_image/040_load/test.ps1 b/tests/cases/025_image/030_load/test.ps1 → tests/cases/020_image/040_load/test.ps1
diff --git a/tests/cases/020_image/050_inspect/test.ps1 b/tests/cases/020_image/050_inspect/test.ps1
@@ -0,0 +1,22 @@
+# SUMMARY: Check that docker image inspect works
+# LABELS:
+# REPEAT:
+
+Set-PSDebug -Trace 2
+
+$imageName = "hello-world"
+
+docker image pull --platform linux $imageName
+if ($lastexitcode -ne 0) {
+    exit 1
+}
+
+$output = [string] (& docker inspect $imageName 2>&1)
+if ($lastexitcode -ne 0) {
+    $output
+    exit 1
+}
+Write-Output "Output of docker inspect of the image:"
+$output | ConvertFrom-Json | ConvertTo-Json
+
+exit 0
diff --git a/tests/cases/040_run/placeholder → ...s/cases/030_container/030_run/placeholder b/tests/cases/040_run/placeholder → ...s/cases/030_container/030_run/placeholder
diff --git a/tests/cases/030_container/040_inspect/test.ps1 b/tests/cases/030_container/040_inspect/test.ps1
@@ -0,0 +1,28 @@
+# SUMMARY: Check that docker container inspect works
+# LABELS:
+# REPEAT:
+
+Set-PSDebug -Trace 2
+
+$imageName = "hello-world"
+$containerName = "inspect_test"
+
+docker container run --platform linux --name $containerName $imageName
+if ($lastexitcode -ne 0) {
+    exit 1
+}
+
+$output = [string] (& docker container inspect $containerName 2>&1)
+if ($lastexitcode -ne 0) {
+    $output
+    docker rm --force $containerName
+    exit 1
+}
+Write-Output "Output of docker inspect of the container:"
+$output | ConvertFrom-Json | ConvertTo-Json
+
+docker container rm --force $containerName
+if ($lastexitcode -ne 0) {
+    exit 1
+}
+exit 0
diff --git a/tests/cases/060_volume/150_utime/foobar b/tests/cases/060_volume/150_utime/foobar
diff --git a/tests/cases/060_volume/010_touch/test.ps1 → tests/cases/100_volume/010_touch/test.ps1 b/tests/cases/060_volume/010_touch/test.ps1 → tests/cases/100_volume/010_touch/test.ps1
diff --git a/tests/cases/060_volume/015_echo/test.ps1 → tests/cases/100_volume/015_echo/test.ps1 b/tests/cases/060_volume/015_echo/test.ps1 → tests/cases/100_volume/015_echo/test.ps1
diff --git a/tests/cases/060_volume/020_mkdir/test.ps1 → tests/cases/100_volume/020_mkdir/test.ps1 b/tests/cases/060_volume/020_mkdir/test.ps1 → tests/cases/100_volume/020_mkdir/test.ps1
diff --git a/.../cases/060_volume/022_mkdir_host/test.ps1 → .../cases/100_volume/022_mkdir_host/test.ps1 b/.../cases/060_volume/022_mkdir_host/test.ps1 → .../cases/100_volume/022_mkdir_host/test.ps1
diff --git a/tests/cases/060_volume/025_mkdir_p/test.ps1 → tests/cases/100_volume/025_mkdir_p/test.ps1 b/tests/cases/060_volume/025_mkdir_p/test.ps1 → tests/cases/100_volume/025_mkdir_p/test.ps1
diff --git a/.../cases/060_volume/030_rmdir_host/test.ps1 → .../cases/100_volume/030_rmdir_host/test.ps1 b/.../cases/060_volume/030_rmdir_host/test.ps1 → .../cases/100_volume/030_rmdir_host/test.ps1
diff --git a/.../060_volume/035_rmdir_nonempty/Dockerfile → .../100_volume/035_rmdir_nonempty/Dockerfile b/.../060_volume/035_rmdir_nonempty/Dockerfile → .../100_volume/035_rmdir_nonempty/Dockerfile
diff --git a/...0_volume/035_rmdir_nonempty/rmdir_test.sh → ...0_volume/035_rmdir_nonempty/rmdir_test.sh b/...0_volume/035_rmdir_nonempty/rmdir_test.sh → ...0_volume/035_rmdir_nonempty/rmdir_test.sh
diff --git a/...es/060_volume/035_rmdir_nonempty/test.ps1 → ...es/100_volume/035_rmdir_nonempty/test.ps1 b/...es/060_volume/035_rmdir_nonempty/test.ps1 → ...es/100_volume/035_rmdir_nonempty/test.ps1
@@ -5,6 +5,7 @@
 Set-PSDebug -Trace 2
 
 $imageName = "rmdir-nonempty"
+$fileName = "output"
 
 docker build --platform linux -t $imageName .
 if ($lastexitcode -ne 0) {
@@ -14,6 +15,12 @@ if ($lastexitcode -ne 0) {
 $p = [string]$pwd.Path
 docker run --rm -v  $p`:/test $imageName /rmdir_test.sh /test
 if ($lastexitcode -ne 0) { 
+    if (Test-Path $fileName) {
+        Remove-Item -Path $fileName -Force
+    }
     exit 1
 }
+if (Test-Path $fileName) {
+    Remove-Item -Path $fileName -Force
+}
 exit 0
diff --git a/.../060_volume/050_symlink_volume/Dockerfile → .../100_volume/050_symlink_volume/Dockerfile b/.../060_volume/050_symlink_volume/Dockerfile → .../100_volume/050_symlink_volume/Dockerfile
diff --git a/...volume/050_symlink_volume/symlink_test.sh → ...volume/050_symlink_volume/symlink_test.sh b/...volume/050_symlink_volume/symlink_test.sh → ...volume/050_symlink_volume/symlink_test.sh
diff --git a/...es/060_volume/050_symlink_volume/test.ps1 → ...es/100_volume/050_symlink_volume/test.ps1 b/...es/060_volume/050_symlink_volume/test.ps1 → ...es/100_volume/050_symlink_volume/test.ps1
diff --git a/...060_volume/055_hardlink_volume/Dockerfile → ...100_volume/055_hardlink_volume/Dockerfile b/...060_volume/055_hardlink_volume/Dockerfile → ...100_volume/055_hardlink_volume/Dockerfile
diff --git a/...lume/055_hardlink_volume/hardlink_test.sh → ...lume/055_hardlink_volume/hardlink_test.sh b/...lume/055_hardlink_volume/hardlink_test.sh → ...lume/055_hardlink_volume/hardlink_test.sh
diff --git a/...s/060_volume/055_hardlink_volume/test.ps1 → ...s/100_volume/055_hardlink_volume/test.ps1 b/...s/060_volume/055_hardlink_volume/test.ps1 → ...s/100_volume/055_hardlink_volume/test.ps1
diff --git a/...s/060_volume/060_mkfifo_volume/Dockerfile → ...s/100_volume/060_mkfifo_volume/Dockerfile b/...s/060_volume/060_mkfifo_volume/Dockerfile → ...s/100_volume/060_mkfifo_volume/Dockerfile
diff --git a/...0_volume/060_mkfifo_volume/mkfifo_test.sh → ...0_volume/060_mkfifo_volume/mkfifo_test.sh b/...0_volume/060_mkfifo_volume/mkfifo_test.sh → ...0_volume/060_mkfifo_volume/mkfifo_test.sh
diff --git a/...ses/060_volume/060_mkfifo_volume/test.ps1 → ...ses/100_volume/060_mkfifo_volume/test.ps1 b/...ses/060_volume/060_mkfifo_volume/test.ps1 → ...ses/100_volume/060_mkfifo_volume/test.ps1
diff --git a/...s/060_volume/070_socket_volume/Dockerfile → ...s/100_volume/070_socket_volume/Dockerfile b/...s/060_volume/070_socket_volume/Dockerfile → ...s/100_volume/070_socket_volume/Dockerfile
diff --git a/...0_volume/070_socket_volume/socket_test.sh → ...0_volume/070_socket_volume/socket_test.sh b/...0_volume/070_socket_volume/socket_test.sh → ...0_volume/070_socket_volume/socket_test.sh
diff --git a/...ses/060_volume/070_socket_volume/test.ps1 → ...ses/100_volume/070_socket_volume/test.ps1 b/...ses/060_volume/070_socket_volume/test.ps1 → ...ses/100_volume/070_socket_volume/test.ps1
diff --git a/...0_volume/100_chown_file_volume/Dockerfile → ...0_volume/100_chown_file_volume/Dockerfile b/...0_volume/100_chown_file_volume/Dockerfile → ...0_volume/100_chown_file_volume/Dockerfile
diff --git a/...olume/100_chown_file_volume/chown_test.sh → ...olume/100_chown_file_volume/chown_test.sh b/...olume/100_chown_file_volume/chown_test.sh → ...olume/100_chown_file_volume/chown_test.sh
diff --git a/...060_volume/100_chown_file_volume/test.ps1 → ...100_volume/100_chown_file_volume/test.ps1 b/...060_volume/100_chown_file_volume/test.ps1 → ...100_volume/100_chown_file_volume/test.ps1
diff --git a/...olume/105_chown_symlink_volume/Dockerfile → ...olume/105_chown_symlink_volume/Dockerfile b/...olume/105_chown_symlink_volume/Dockerfile → ...olume/105_chown_symlink_volume/Dockerfile
diff --git a/...me/105_chown_symlink_volume/chown_test.sh → ...me/105_chown_symlink_volume/chown_test.sh b/...me/105_chown_symlink_volume/chown_test.sh → ...me/105_chown_symlink_volume/chown_test.sh
diff --git a/..._volume/105_chown_symlink_volume/test.ps1 → ..._volume/105_chown_symlink_volume/test.ps1 b/..._volume/105_chown_symlink_volume/test.ps1 → ..._volume/105_chown_symlink_volume/test.ps1
diff --git a/...ume/110_chmod_file_mode_volume/Dockerfile → ...ume/110_chmod_file_mode_volume/Dockerfile b/...ume/110_chmod_file_mode_volume/Dockerfile → ...ume/110_chmod_file_mode_volume/Dockerfile
diff --git a/.../110_chmod_file_mode_volume/chmod_test.sh → .../110_chmod_file_mode_volume/chmod_test.sh b/.../110_chmod_file_mode_volume/chmod_test.sh → .../110_chmod_file_mode_volume/chmod_test.sh
diff --git a/...olume/110_chmod_file_mode_volume/test.ps1 → ...olume/110_chmod_file_mode_volume/test.ps1 b/...olume/110_chmod_file_mode_volume/test.ps1 → ...olume/110_chmod_file_mode_volume/test.ps1
diff --git a/...e/120_chmod_file_access_volume/Dockerfile → ...e/120_chmod_file_access_volume/Dockerfile b/...e/120_chmod_file_access_volume/Dockerfile → ...e/120_chmod_file_access_volume/Dockerfile
diff --git a/...20_chmod_file_access_volume/chmod_test.sh → ...20_chmod_file_access_volume/chmod_test.sh b/...20_chmod_file_access_volume/chmod_test.sh → ...20_chmod_file_access_volume/chmod_test.sh
diff --git a/...ume/120_chmod_file_access_volume/test.ps1 → ...ume/120_chmod_file_access_volume/test.ps1 b/...ume/120_chmod_file_access_volume/test.ps1 → ...ume/120_chmod_file_access_volume/test.ps1
diff --git a/.../cases/060_volume/150_utime/check_time.sh → .../cases/100_volume/150_utime/check_time.sh b/.../cases/060_volume/150_utime/check_time.sh → .../cases/100_volume/150_utime/check_time.sh
diff --git a/tests/cases/060_volume/150_utime/test.ps1 → tests/cases/100_volume/150_utime/test.ps1 b/tests/cases/060_volume/150_utime/test.ps1 → tests/cases/100_volume/150_utime/test.ps1
@@ -41,4 +41,8 @@ if ($lastexitcode -ne 0) {
     }
     exit 1
 }
+
+if (Test-Path $fileName) {
+    Remove-Item -Path $fileName -Force
+}
 exit 0
diff --git a/tests/cases/060_volume/200_statfs/Dockerfile → tests/cases/100_volume/200_statfs/Dockerfile b/tests/cases/060_volume/200_statfs/Dockerfile → tests/cases/100_volume/200_statfs/Dockerfile
diff --git a/...ases/060_volume/200_statfs/statfs_test.sh → ...ases/100_volume/200_statfs/statfs_test.sh b/...ases/060_volume/200_statfs/statfs_test.sh → ...ases/100_volume/200_statfs/statfs_test.sh
diff --git a/tests/cases/060_volume/200_statfs/test.ps1 → tests/cases/100_volume/200_statfs/test.ps1 b/tests/cases/060_volume/200_statfs/test.ps1 → tests/cases/100_volume/200_statfs/test.ps1
diff --git a/.../cases/050_network/010_localhost/test.ps1 → .../cases/110_network/010_localhost/test.ps1 b/.../cases/050_network/010_localhost/test.ps1 → .../cases/110_network/010_localhost/test.ps1
diff --git a/tests/cases/100_compose/placeholder → tests/cases/200_compose/placeholder b/tests/cases/100_compose/placeholder → tests/cases/200_compose/placeholder
diff --git a/tests/cases/200_apps/placeholder → tests/cases/300_apps/placeholder b/tests/cases/200_apps/placeholder → tests/cases/300_apps/placeholder
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,4 +41,8 @@ if ($lastexitcode -ne 0) { @@
         }
         exit 1
     }
+    if (Test-Path $fileName) {
+        Remove-Item -Path $fileName -Force
+    }
     exit 0