projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15370: Merge branch 'main' into 15370-loopback-dispatchcloud
[arvados.git]
/
lib
/
crunchrun
/
integration_test.go
diff --git
a/lib/crunchrun/integration_test.go
b/lib/crunchrun/integration_test.go
index ff2165338a16e41f8d9db76ec1d8128dda9691e7..ce92a9b8075c083ebfc13d0748c88b890ad7052d 100644
(file)
--- a/
lib/crunchrun/integration_test.go
+++ b/
lib/crunchrun/integration_test.go
@@
-162,11
+162,13
@@
func (s *integrationSuite) setup(c *C) {
func (s *integrationSuite) TestRunTrivialContainerWithDocker(c *C) {
s.engine = "docker"
s.testRunTrivialContainer(c)
func (s *integrationSuite) TestRunTrivialContainerWithDocker(c *C) {
s.engine = "docker"
s.testRunTrivialContainer(c)
+ c.Check(s.logFiles["crunch-run.txt"], Matches, `(?ms).*Using container runtime: docker Engine \d+\.\d+.*`)
}
func (s *integrationSuite) TestRunTrivialContainerWithSingularity(c *C) {
s.engine = "singularity"
s.testRunTrivialContainer(c)
}
func (s *integrationSuite) TestRunTrivialContainerWithSingularity(c *C) {
s.engine = "singularity"
s.testRunTrivialContainer(c)
+ c.Check(s.logFiles["crunch-run.txt"], Matches, `(?ms).*Using container runtime: singularity.* version 3\.\d+.*`)
}
func (s *integrationSuite) TestRunTrivialContainerWithLocalKeepstore(c *C) {
}
func (s *integrationSuite) TestRunTrivialContainerWithLocalKeepstore(c *C) {