tblyler/reg
1
0
Fork 0
mirror of https://github.com/genuinetools/reg.git synced 2024-05-20 12:08:33 -04:00
Code Issues Projects Releases Wiki Activity

update tests

Browse source 
Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
This commit is contained in:
Jess Frazelle 2018-07-14 12:02:52 -04:00
parent 0d395c8b96
commit 3fe7b0d80c
No known key found for this signature in database
GPG key ID: 18F3685C0022BFF3
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
testutils/testutils.go
View file

@ -142,7 +142,7 @@ func StartClair(dcli *client.Client) (string, string, error) {
ctx := filepath.Dir(filepath.Dir(filename))
tw, err := tarit(ctx)
if err != nil {
return dbID, "", err
return dbID, "", fmt.Errorf("tarit: %v", err)
}
// build the image
@ -366,13 +366,20 @@ func tarit(src string) (io.Reader, error) {
if err != nil {
return err
}
header, err := tar.FileInfoHeader(info, info.Name())
var link string
if info.Mode()&os.ModeSymlink == os.ModeSymlink {
if link, err = os.Readlink(path); err != nil {
return err
}
}
header, err := tar.FileInfoHeader(info, link)
if err != nil {
return err
}
header.Name = strings.TrimPrefix(path, src)
if err := tarball.WriteHeader(header); err != nil {
return err
}
@ -381,6 +388,10 @@ func tarit(src string) (io.Reader, error) {
return nil
}
if !info.Mode().IsRegular() { //nothing more to do for non-regular
return nil
}
file, err := os.Open(path)
if err != nil {
return err