opensourcemirror
/
concourse
mirror of https://github.com/concourse/concourse.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix hooks_test 

Signed-off-by: Krishna Mannem <kmannem@pivotal.io>
Signed-off-by: Sameer Vohra <vohra.sam@gmail.com>
This commit is contained in:
Sameer Vohra 2019-11-29 20:29:18 -06:00 committed by Sameer Vohra
parent c5c0178c48
commit 7656900027
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
atc/worker/image/image_resource_fetcher.go
View File

@ -55,7 +55,7 @@ type ImageResourceFetcher interface {
}
type imageResourceFetcherFactory struct {
resourceFactory resource.ResourceFactory
resourceFactory resource.ResourceFactory
dbResourceCacheFactory db.ResourceCacheFactory
dbResourceConfigFactory db.ResourceConfigFactory
resourceFetcher worker.Fetcher
@ -68,7 +68,7 @@ func NewImageResourceFetcherFactory(
resourceFetcher worker.Fetcher,
) ImageResourceFetcherFactory {
return &imageResourceFetcherFactory{
resourceFactory: resourceFactory,
resourceFactory: resourceFactory,
dbResourceCacheFactory: dbResourceCacheFactory,
dbResourceConfigFactory: dbResourceConfigFactory,
resourceFetcher: resourceFetcher,
@ -86,7 +86,7 @@ func (f *imageResourceFetcherFactory) NewImageResourceFetcher(
return &imageResourceFetcher{
worker: worker,
resourceFetcher: f.resourceFetcher,
resourceFactory: f.resourceFactory,
resourceFactory: f.resourceFactory,
dbResourceCacheFactory: f.dbResourceCacheFactory,
dbResourceConfigFactory: f.dbResourceConfigFactory,
@ -101,7 +101,7 @@ func (f *imageResourceFetcherFactory) NewImageResourceFetcher(
type imageResourceFetcher struct {
worker worker.Worker
resourceFetcher worker.Fetcher
resourceFactory resource.ResourceFactory
resourceFactory resource.ResourceFactory
dbResourceCacheFactory db.ResourceCacheFactory
dbResourceConfigFactory db.ResourceConfigFactory

2
testflight/hooks_test.go
View File

@ -45,6 +45,8 @@ var _ = Describe("A pipeline containing jobs with hooks", func() {
By("performing ensure and on_abort steps on abort")
watch = spawnFly("trigger-job", "-j", inPipeline("some-aborted-job"), "-w")
// The first eventually is for the initialization block, when the script hasn't been executed yet.
Eventually(watch).Should(gbytes.Say("echo waiting to be aborted"))
Eventually(watch).Should(gbytes.Say("waiting to be aborted"))
fly("abort-build", "-j", inPipeline("some-aborted-job"), "-b", "1")
<-watch.Exited