github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-08-15 21:23:39 +00:00
Code Issues Projects Releases Wiki Activity

proxy_test: Add helper to read all from a reply

Browse Source 
Prep for testing `GetConfig`.

Signed-off-by: Colin Walters <walters@verbum.org>
This commit is contained in:
Colin Walters 2021-11-08 09:38:46 -05:00
parent f90725d80c
commit 2bb6f27d13
1 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
integration/proxy_test.go
View File

@ -131,6 +131,42 @@ func (self *proxy) callNoFd(method string, args []interface{}) (rval interface{}
return rval, nil return rval, nil
} }
func (self *proxy) callReadAllBytes(method string, args []interface{}) (rval interface{}, buf []byte, err error) {
var fd *pipefd
rval, fd, err = self.call(method, args)
if err != nil {
return
}
if fd == nil {
err = fmt.Errorf("Expected fd from method %s", method)
return
}
fetchchan := make(chan byteFetch)
go func() {
manifestBytes, err := ioutil.ReadAll(fd.fd)
fetchchan <- byteFetch{
content: manifestBytes,
err: err,
}
}()
_, err = self.callNoFd("FinishPipe", []interface{}{fd.id})
if err != nil {
return
}
select {
case fetchRes := <-fetchchan:
err = fetchRes.err
if err != nil {
return
}
buf = fetchRes.content
case <-time.After(5 * time.Minute):
err = fmt.Errorf("timed out during proxy fetch")
}
return
}
func newProxy() (*proxy, error) { func newProxy() (*proxy, error) {
fds, err := syscall.Socketpair(syscall.AF_LOCAL, syscall.SOCK_SEQPACKET, 0) fds, err := syscall.Socketpair(syscall.AF_LOCAL, syscall.SOCK_SEQPACKET, 0)
if err != nil { if err != nil {
@ -206,35 +242,16 @@ func runTestGetManifest(p *proxy, img string) error {
} }
imgid := uint32(imgidv) imgid := uint32(imgidv)
v, fd, err := p.call("GetManifest", []interface{}{imgid}) v, manifestBytes, err := p.callReadAllBytes("GetManifest", []interface{}{imgid})
if err != nil { if err != nil {
return err return err
} }
if fd == nil { _, err = manifest.OCI1FromManifest(manifestBytes)
return fmt.Errorf("expected GetManifest fd")
}
fetchchan := make(chan byteFetch)
go func() {
manifestBytes, err := ioutil.ReadAll(fd.fd)
fetchchan <- byteFetch{
content: manifestBytes,
err: err,
}
}()
_, _, err = p.call("FinishPipe", []interface{}{fd.id})
if err != nil {
return err
}
fetchRes := <-fetchchan
if fetchRes.err != nil {
return err
}
_, err = manifest.OCI1FromManifest(fetchRes.content)
if err != nil { if err != nil {
return err return err
} }
_, _, err = p.call("CloseImage", []interface{}{imgid}) _, err = p.callNoFd("CloseImage", []interface{}{imgid})
return nil return nil
} }