Skip to content

Commit

Permalink
Merge pull request containers#3814 from Luap99/fix-network-backend-test
Browse files Browse the repository at this point in the history
tests/copy: read correct containers.conf
  • Loading branch information
openshift-merge-robot committed Mar 9, 2022
2 parents 8303587 + 00fe346 commit 2605775
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions tests/copy/copy.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,9 @@ func main() {
}
imageStorage.Transport.SetStore(store)

var conf *config.Config
if containersConf, ok := os.LookupEnv("CONTAINERS_CONF"); ok {
conf, err = config.NewConfig(containersConf)
if err != nil {
return err
}
} else {
conf, err = config.DefaultConfig()
if err != nil {
return err
}
conf, err := config.Default()
if err != nil {
return err
}
_, _, err = network.NetworkBackend(store, conf, false)
if err != nil {
Expand Down

0 comments on commit 2605775

Please sign in to comment.