projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '21086-cert-source'
[arvados.git]
/
lib
/
crunchrun
/
crunchrun_test.go
diff --git
a/lib/crunchrun/crunchrun_test.go
b/lib/crunchrun/crunchrun_test.go
index 30f3ea4bb46ddedf7dbd814ad8b602d40bb95672..c53382135136b37b2cfae004fb6f318b13dbc2f5 100644
(file)
--- a/
lib/crunchrun/crunchrun_test.go
+++ b/
lib/crunchrun/crunchrun_test.go
@@
-1413,11
+1413,11
@@
func (am *ArvMountCmdLine) ArvMountTest(c []string, token string) (*exec.Cmd, er
return nil, nil
}
return nil, nil
}
-func stubCert(temp string) string {
+func stubCert(
c *C,
temp string) string {
path := temp + "/ca-certificates.crt"
path := temp + "/ca-certificates.crt"
-
crt, _ := os.Create(path
)
- c
rt.Close(
)
- arvadosclient.CertFiles = []string{path}
+
err := os.WriteFile(path, []byte{}, 0666
)
+ c
.Assert(err, IsNil
)
+ os.Setenv("SSL_CERT_FILE", path)
return path
}
return path
}
@@
-1432,7
+1432,7
@@
func (s *TestSuite) TestSetupMounts(c *C) {
realTemp := c.MkDir()
certTemp := c.MkDir()
realTemp := c.MkDir()
certTemp := c.MkDir()
- stubCertPath := stubCert(certTemp)
+ stubCertPath := stubCert(c
, c
ertTemp)
cr.parentTemp = realTemp
i := 0
cr.parentTemp = realTemp
i := 0