Skip to content

Commit 52dd188

Browse files
test: Fix error messages and output format
- Fix error message formats to match test expectations - Remove 'Error: ' prefix from messages - Fix header order and message placement - Simplify error handling in utility functions - Remove duplicate network status messages Signed-off-by: deveshgoyal1000 <[email protected]>
1 parent 9704b60 commit 52dd188

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

internal/container.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -253,35 +253,34 @@ func UntarFiles(src, dest string, files []string) error {
253253
}
254254
defer archiveFile.Close()
255255

256-
err = iterateTarArchive(src, func(r *tar.Reader, header *tar.Header) error {
256+
if err := iterateTarArchive(src, func(r *tar.Reader, header *tar.Header) error {
257257
// Check if the current entry is one of the target files
258258
for _, file := range files {
259259
if strings.Contains(header.Name, file) {
260260
// Create the destination folder
261261
if err := os.MkdirAll(filepath.Join(dest, filepath.Dir(header.Name)), 0o700); err != nil {
262-
return fmt.Errorf("failed to create directory: %w", err)
262+
return err
263263
}
264264
// Create the destination file
265265
destFile, err := os.Create(filepath.Join(dest, header.Name))
266266
if err != nil {
267-
return fmt.Errorf("failed to create file: %w", err)
267+
return err
268268
}
269269
defer destFile.Close()
270270

271271
// Copy the contents of the entry to the destination file
272272
_, err = io.Copy(destFile, r)
273273
if err != nil {
274-
return fmt.Errorf("failed to copy file contents: %w", err)
274+
return err
275275
}
276276

277277
// File successfully extracted, move to the next file
278278
break
279279
}
280280
}
281281
return nil
282-
})
283-
if err != nil {
284-
return fmt.Errorf("Error: %v", err)
282+
}); err != nil {
283+
return err
285284
}
286285

287286
return nil

0 commit comments

Comments
 (0)