tests: convert tests to new style

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi 2021-10-20 12:03:22 -07:00
parent c08f619b02
commit d763976ea9
13 changed files with 79 additions and 104 deletions

View File

@ -1,23 +1,22 @@
package testing package testing
import "alpha.dagger.io/dagger/op"
A: { A: {
result: string result: string
#up: [ #up: [
{ op.#FetchContainer & {
do: "fetch-container"
ref: "alpine" ref: "alpine"
}, },
{ op.#Exec & {
do: "exec"
args: ["sh", "-c", """ args: ["sh", "-c", """
echo '{"result": "from A"}' > /tmp/out echo '{"result": "from A"}' > /tmp/out
""", """,
] ]
dir: "/" dir: "/"
}, },
{ op.#Export & {
do: "export"
// Source path in the container // Source path in the container
source: "/tmp/out" source: "/tmp/out"
format: "json" format: "json"
@ -29,20 +28,17 @@ B: {
result: string result: string
#up: [ #up: [
{ op.#FetchContainer & {
do: "fetch-container"
ref: "alpine" ref: "alpine"
}, },
{ op.#Exec & {
do: "exec"
args: ["sh", "-c", """ args: ["sh", "-c", """
echo "{\\"result\\": \\"dependency \(A.result)\\"}" > /tmp/out echo "{\\"result\\": \\"dependency \(A.result)\\"}" > /tmp/out
""", """,
] ]
dir: "/" dir: "/"
}, },
{ op.#Export & {
do: "export"
// Source path in the container // Source path in the container
source: "/tmp/out" source: "/tmp/out"
format: "json" format: "json"

View File

@ -1,23 +1,21 @@
package testing package testing
import "alpha.dagger.io/dagger/op"
A: { A: {
result: string result: string
#up: [ #up: [
{ op.#FetchContainer & {
do: "fetch-container"
ref: "alpine" ref: "alpine"
}, },
{ op.#Exec & {
do: "exec"
args: ["sh", "-c", """ args: ["sh", "-c", """
echo '{"result": "from A"}' > /tmp/out echo '{"result": "from A"}' > /tmp/out
""", """,
] ]
dir: "/"
}, },
{ op.#Export & {
do: "export"
// Source path in the container // Source path in the container
source: "/tmp/out" source: "/tmp/out"
format: "json" format: "json"
@ -29,12 +27,10 @@ B: {
result: string result: string
#up: [ #up: [
{ op.#FetchContainer & {
do: "fetch-container"
ref: "alpine" ref: "alpine"
}, },
{ op.#Exec & {
do: "exec"
env: DATA: A.result env: DATA: A.result
args: ["sh", "-c", """ args: ["sh", "-c", """
echo "{\\"result\\": \\"dependency $DATA\\"}" > /tmp/out echo "{\\"result\\": \\"dependency $DATA\\"}" > /tmp/out
@ -42,8 +38,7 @@ B: {
] ]
dir: "/" dir: "/"
}, },
{ op.#Export & {
do: "export"
// Source path in the container // Source path in the container
source: "/tmp/out" source: "/tmp/out"
format: "json" format: "json"

View File

@ -1,25 +1,25 @@
package testing package testing
import "encoding/json" import (
"encoding/json"
"alpha.dagger.io/dagger/op"
)
A: { A: {
string string
#up: [ #up: [
{ op.#FetchContainer & {
do: "fetch-container"
ref: "alpine" ref: "alpine"
}, },
{ op.#Exec & {
do: "exec"
args: ["sh", "-c", """ args: ["sh", "-c", """
echo '{"hello": "world"}' > /tmp/out echo '{"hello": "world"}' > /tmp/out
""", """,
] ]
dir: "/" dir: "/"
}, },
{ op.#Export & {
do: "export"
// Source path in the container // Source path in the container
source: "/tmp/out" source: "/tmp/out"
format: "string" format: "string"
@ -33,20 +33,17 @@ B: {
result: string result: string
#up: [ #up: [
{ op.#FetchContainer & {
do: "fetch-container"
ref: "alpine" ref: "alpine"
}, },
{ op.#Exec & {
do: "exec"
args: ["sh", "-c", """ args: ["sh", "-c", """
echo "{\\"result\\": \\"unmarshalled.hello=\(unmarshalled.hello)\\"}" > /tmp/out echo "{\\"result\\": \\"unmarshalled.hello=\(unmarshalled.hello)\\"}" > /tmp/out
""", """,
] ]
dir: "/" dir: "/"
}, },
{ op.#Export & {
do: "export"
// Source path in the container // Source path in the container
source: "/tmp/out" source: "/tmp/out"
format: "json" format: "json"

View File

@ -1,25 +1,24 @@
package testing package testing
import "alpha.dagger.io/dagger/op"
X1=in: string | *"default input" X1=in: string | *"default input"
test: { test: {
string string
#up: [ #up: [
{ op.#FetchContainer & {
do: "fetch-container"
ref: "alpine" ref: "alpine"
}, },
{ op.#Exec & {
do: "exec"
args: ["sh", "-c", """ args: ["sh", "-c", """
echo -n "received: \(X1)" > /out echo -n "received: \(X1)" > /out
"""] """]
// XXX Blocked by https://github.com/blocklayerhq/dagger/issues/19 // XXX Blocked by https://github.com/blocklayerhq/dagger/issues/19
dir: "/" dir: "/"
}, },
{ op.#Export & {
do: "export"
source: "/out" source: "/out"
format: "string" format: "string"
}, },

View File

@ -1,25 +1,24 @@
package testing package testing
import "alpha.dagger.io/dagger/op"
X1=in: string X1=in: string
test: { test: {
string string
#up: [ #up: [
{ op.#FetchContainer & {
do: "fetch-container"
ref: "alpine" ref: "alpine"
}, },
{ op.#Exec & {
do: "exec"
args: ["sh", "-c", """ args: ["sh", "-c", """
echo -n "received: \(X1)" > /out echo -n "received: \(X1)" > /out
"""] """]
// XXX Blocked by https://github.com/blocklayerhq/dagger/issues/19 // XXX Blocked by https://github.com/blocklayerhq/dagger/issues/19
dir: "/" dir: "/"
}, },
{ op.#Export & {
do: "export"
source: "/out" source: "/out"
format: "string" format: "string"
}, },

View File

@ -1,17 +1,19 @@
package testing package testing
import "alpha.dagger.io/dagger/op"
new_prop: "lala" new_prop: "lala"
#new_def: "lala" #new_def: "lala"
new_prop_too: string new_prop_too: string
#new_def_too: string #new_def_too: string
#up: [{ #up: [
do: "fetch-container" op.#FetchContainer & {
ref: "busybox" ref: "busybox"
}, },
{ op.#Exec & {
do: "exec"
args: ["true"] args: ["true"]
dir: "/" dir: "/"
}] },
]

View File

@ -1,5 +1,7 @@
package testing package testing
import "alpha.dagger.io/dagger/op"
foo: { foo: {
new_prop: "lala" new_prop: "lala"
#new_def: "lala" #new_def: "lala"
@ -7,13 +9,13 @@ foo: {
new_prop_too: string new_prop_too: string
#new_def_too: string #new_def_too: string
#up: [{ #up: [
do: "fetch-container" op.#FetchContainer & {
ref: "busybox" ref: "busybox"
}, },
{ op.#Exec & {
do: "exec"
args: ["true"] args: ["true"]
dir: "/" dir: "/"
}] },
]
} }

View File

@ -1,12 +1,12 @@
package testing package testing
import "alpha.dagger.io/dagger/op"
#up: [ #up: [
{ op.#FetchContainer & {
do: "fetch-container"
ref: "busybox" ref: "busybox"
}, },
{ op.#Exec & {
do: "exec"
args: ["true"] args: ["true"]
dir: "/" dir: "/"
}, },

View File

@ -1,15 +1,14 @@
package def package def
import "alpha.dagger.io/dagger/op"
#dang: string #dang: string
#up: [ #up: [
{ op.#FetchContainer & {
do: "fetch-container"
ref: "alpine" ref: "alpine"
}, },
{ op.#Exec & {
do: "exec"
dir: "/"
args: ["sh", "-c", """ args: ["sh", "-c", """
echo success echo success
"""] """]

View File

@ -1,15 +1,14 @@
package nonoptional package nonoptional
import "alpha.dagger.io/dagger/op"
dang: string dang: string
#up: [ #up: [
{ op.#FetchContainer & {
do: "fetch-container"
ref: "alpine" ref: "alpine"
}, },
{ op.#Exec & {
do: "exec"
dir: "/"
args: ["sh", "-c", """ args: ["sh", "-c", """
echo "This test SHOULD fail, because this SHOULD be executed" echo "This test SHOULD fail, because this SHOULD be executed"
exit 1 exit 1

View File

@ -1,15 +1,14 @@
package optional package optional
import "alpha.dagger.io/dagger/op"
dang?: string dang?: string
#up: [ #up: [
{ op.#FetchContainer & {
do: "fetch-container"
ref: "alpine" ref: "alpine"
}, },
{ op.#Exec & {
do: "exec"
dir: "/"
args: ["sh", "-c", """ args: ["sh", "-c", """
echo success echo success
"""] """]

View File

@ -44,20 +44,16 @@ TestExportList: {
[...string] [...string]
#up: [ #up: [
{ op.#FetchContainer & {
do: "fetch-container"
ref: "alpine" ref: "alpine"
}, },
{ op.#Exec & {
do: "exec"
args: ["sh", "-c", """ args: ["sh", "-c", """
echo '["milk", "pumpkin pie", "eggs", "juice"]' > /tmp/out echo '["milk", "pumpkin pie", "eggs", "juice"]' > /tmp/out
""", """,
] ]
dir: "/"
}, },
{ op.#Export & {
do: "export"
// Source path in the container // Source path in the container
source: "/tmp/out" source: "/tmp/out"
format: "json" format: "json"

View File

@ -27,22 +27,17 @@ TestExportList: {
[...string] [...string]
#up: [ #up: [
{ op.#FetchContainer & {
do: "fetch-container"
ref: "alpine" ref: "alpine"
}, },
{ op.#Exec & {
do: "exec"
args: ["sh", "-c", """ args: ["sh", "-c", """
echo "--- # Shopping list echo "--- # Shopping list
[milk, pumpkin pie, eggs, juice]" > /tmp/out [milk, pumpkin pie, eggs, juice]" > /tmp/out
""", """,
] ]
// XXX Blocked by https://github.com/blocklayerhq/dagger/issues/19
dir: "/"
}, },
{ op.#Export & {
do: "export"
// Source path in the container // Source path in the container
source: "/tmp/out" source: "/tmp/out"
format: "yaml" format: "yaml"
@ -51,19 +46,16 @@ TestExportList: {
} }
TestExportMap: #up: [ TestExportMap: #up: [
{ op.#FetchContainer & {
do: "fetch-container"
ref: "alpine" ref: "alpine"
}, },
{ op.#Exec & {
do: "exec"
args: ["sh", "-c", """ args: ["sh", "-c", """
echo something: something > /tmp/out echo something: something > /tmp/out
""", """,
] ]
}, },
{ op.#Export & {
do: "export"
// Source path in the container // Source path in the container
source: "/tmp/out" source: "/tmp/out"
format: "yaml" format: "yaml"