forked from TrueCloudLab/neoneo-go
Merge pull request #1602 from nspcc-dev/fix/test
vmcli/test: run shell after providing input
This commit is contained in:
commit
f3e64e08d7
2 changed files with 7 additions and 7 deletions
|
@ -61,13 +61,13 @@ func TestCompiler(t *testing.T) {
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
err = os.MkdirAll(exampleSavePath, os.ModePerm)
|
err = os.MkdirAll(exampleSavePath, os.ModePerm)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
outfile := exampleSavePath + "/test.nef"
|
|
||||||
_, err = compiler.CompileAndSave(exampleCompilePath+"/"+infos[0].Name(), &compiler.Options{Outfile: outfile})
|
|
||||||
require.NoError(t, err)
|
|
||||||
defer func() {
|
defer func() {
|
||||||
err := os.RemoveAll(exampleSavePath)
|
err := os.RemoveAll(exampleSavePath)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
}()
|
}()
|
||||||
|
outfile := exampleSavePath + "/test.nef"
|
||||||
|
_, err = compiler.CompileAndSave(exampleCompilePath+"/"+infos[0].Name(), &compiler.Options{Outfile: outfile})
|
||||||
|
require.NoError(t, err)
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -75,16 +75,16 @@ func newTestVMCLIWithLogo(t *testing.T, printLogo bool) *executor {
|
||||||
Stdin: e.in,
|
Stdin: e.in,
|
||||||
Stdout: e.out,
|
Stdout: e.out,
|
||||||
})
|
})
|
||||||
go func() {
|
|
||||||
require.NoError(t, e.cli.Run())
|
|
||||||
close(e.ch)
|
|
||||||
}()
|
|
||||||
return e
|
return e
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *executor) runProg(t *testing.T, commands ...string) {
|
func (e *executor) runProg(t *testing.T, commands ...string) {
|
||||||
cmd := strings.Join(commands, "\n") + "\n"
|
cmd := strings.Join(commands, "\n") + "\n"
|
||||||
e.in.WriteString(cmd + "\n")
|
e.in.WriteString(cmd + "\n")
|
||||||
|
go func() {
|
||||||
|
require.NoError(t, e.cli.Run())
|
||||||
|
close(e.ch)
|
||||||
|
}()
|
||||||
select {
|
select {
|
||||||
case <-e.ch:
|
case <-e.ch:
|
||||||
case <-time.After(time.Second):
|
case <-time.After(time.Second):
|
||||||
|
|
Loading…
Reference in a new issue