Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set TestData object to allow more tests to run #474

Merged
merged 25 commits into from
Jun 9, 2023
Merged

Set TestData object to allow more tests to run #474

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
1b34f1d
wip
b1ron Jun 6, 2023
f549f84
fix testName property for jsTestName function
b1ron Jun 6, 2023
bf8e293
Merge branch 'main' into set-testdata
b1ron Jun 7, 2023
64f43b9
add a comment
b1ron Jun 7, 2023
336012b
remove get_more.js from fail
b1ron Jun 7, 2023
5b1a2e6
fix
b1ron Jun 7, 2023
9ed4207
add comment
b1ron Jun 7, 2023
dbb07f6
Merge branch 'main' into set-testdata
b1ron Jun 7, 2023
5d606b9
add comment
b1ron Jun 7, 2023
e1de700
Merge branch 'main' into set-testdata
b1ron Jun 7, 2023
76e5c91
Merge branch 'main' into set-testdata
mergify[bot] Jun 7, 2023
b91dbf8
use a bytes.Buffer and proper verb
b1ron Jun 7, 2023
9cb2581
fix stats for mongo
b1ron Jun 7, 2023
fa55e9c
fix stats
b1ron Jun 7, 2023
5e36a4b
simplify
b1ron Jun 8, 2023
da31d11
fix comment
b1ron Jun 8, 2023
cfe441e
change var name
b1ron Jun 8, 2023
259c115
extract out eval builder
b1ron Jun 8, 2023
fc0ec25
lint
b1ron Jun 8, 2023
1213116
break
b1ron Jun 8, 2023
5ea7ad9
revert to nil
b1ron Jun 8, 2023
741509e
just log the script
b1ron Jun 9, 2023
028b3d8
only use fmt.Fprintf
b1ron Jun 9, 2023
087ddfe
log everything
b1ron Jun 9, 2023
d046711
Merge branch 'main' into set-testdata
mergify[bot] Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
lint
  • Loading branch information
@b1ron
b1ron committed Jun 8, 2023
commit fc0ec257cf8fbb7fb6baf360653cd129a9055240
6 changes: 5 additions & 1 deletion internal/jstest/jstest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,10 @@ func runShellWithScript(dir, script string) ([]byte, error) {
}

dockerArgs := []string{"compose", "run", "-T", "--rm", "mongo"}
shellArgs := []string{"--verbose", "--norc", "mongodb://host.docker.internal:27017/", "--eval", evalBuilder(script, nil), script}
shellArgs := []string{
"--verbose", "--norc", "mongodb://host.docker.internal:27017/",
"--eval", evalBuilder(script, nil), script,
}
dockerArgs = append(dockerArgs, shellArgs...)

cmd := exec.Command(bin, dockerArgs...)
Expand All @@ -169,6 +172,7 @@ func evalBuilder(script string, obj map[string]string) string {
eb.WriteByte(' ')
scriptName := filepath.Base(script)
fmt.Fprintf(&eb, "TestData.testName = %q;", strings.TrimSuffix(scriptName, filepath.Ext(scriptName)))

if obj == nil {
return eb.String()
}
Expand Down