StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove errorHandler from FixtureFactory am: cff464f794

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1647192

Change-Id: If8cacd24e66108952219597026c0391b660bc3e9
This commit is contained in:
Paul Duffin
2021-03-22 19:29:08 +00:00
committed by Automerger Merge Worker
parent 559c073415 cff464f794
commit 2e831d6ae6
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
android/fixture.go
View File

@@ -228,9 +228,6 @@ func NewFixtureFactory(buildDirSupplier *string, preparers ...FixturePreparer) F
return &fixtureFactory{ return &fixtureFactory{
buildDirSupplier: buildDirSupplier, buildDirSupplier: buildDirSupplier,
preparers: dedupAndFlattenPreparers(nil, preparers), preparers: dedupAndFlattenPreparers(nil, preparers),
// Set the default error handler.
errorHandler: FixtureExpectsNoErrors,
} }
} }
@@ -647,7 +644,6 @@ var _ FixtureFactory = (*fixtureFactory)(nil)
type fixtureFactory struct { type fixtureFactory struct {
buildDirSupplier *string buildDirSupplier *string
preparers []*simpleFixturePreparer preparers []*simpleFixturePreparer
errorHandler FixtureErrorHandler
} }
func (f *fixtureFactory) Extend(preparers ...FixturePreparer) FixtureFactory { func (f *fixtureFactory) Extend(preparers ...FixturePreparer) FixtureFactory {
@@ -684,7 +680,8 @@ func (f *fixtureFactory) Fixture(t *testing.T, preparers ...FixturePreparer) Fix
config: config, config: config,
ctx: ctx, ctx: ctx,
mockFS: make(MockFS), mockFS: make(MockFS),
errorHandler: f.errorHandler, // Set the default error handler.
errorHandler: FixtureExpectsNoErrors,
} }
for _, preparer := range all { for _, preparer := range all {
@@ -695,10 +692,9 @@ func (f *fixtureFactory) Fixture(t *testing.T, preparers ...FixturePreparer) Fix
} }
func (f *fixtureFactory) ExtendWithErrorHandler(errorHandler FixtureErrorHandler) FixtureFactory { func (f *fixtureFactory) ExtendWithErrorHandler(errorHandler FixtureErrorHandler) FixtureFactory {
newFactory := &fixtureFactory{} return f.Extend(newSimpleFixturePreparer(func(fixture *fixture) {
*newFactory = *f fixture.errorHandler = errorHandler
newFactory.errorHandler = errorHandler }))
return newFactory
} }
func (f *fixtureFactory) RunTest(t *testing.T, preparers ...FixturePreparer) *TestResult { func (f *fixtureFactory) RunTest(t *testing.T, preparers ...FixturePreparer) *TestResult {