diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-03-20 00:36:55 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2021-03-22 18:31:53 +0000 |
| commit | 89648f98faf46f4c9ae2b084167a79f7da2df567 (patch) | |
| tree | 38c2561883b220b1ee671748d17c1657c42a77c9 /python/python_test.go | |
| parent | 30ac3e7ca75106d7f883558c46501296d4bffcfc (diff) | |
Remove usages of FixtureFactory from misc packages
These packages have already been migrated to use per test build
directory so have no need for a FixtureFactory.
Bug: 183235980
Test: m nothing
Change-Id: I667d1d992caaf0f615de91f89efdae11c44986c2
Diffstat (limited to 'python/python_test.go')
| -rw-r--r-- | python/python_test.go | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/python/python_test.go b/python/python_test.go index 6263c8a25..f57f504d7 100644 --- a/python/python_test.go +++ b/python/python_test.go @@ -335,13 +335,12 @@ func TestPythonModule(t *testing.T) { } t.Run(d.desc, func(t *testing.T) { - result := emptyFixtureFactory. - ExtendWithErrorHandler(android.FixtureExpectsAllErrorsToMatchAPattern(errorPatterns)). - RunTest(t, - android.PrepareForTestWithDefaults, - PrepareForTestWithPythonBuildComponents, - d.mockFiles.AddToFixture(), - ) + result := android.GroupFixturePreparers( + android.PrepareForTestWithDefaults, + PrepareForTestWithPythonBuildComponents, + d.mockFiles.AddToFixture(), + ).ExtendWithErrorHandler(android.FixtureExpectsAllErrorsToMatchAPattern(errorPatterns)). + RunTest(t) if len(result.Errs) > 0 { return @@ -376,8 +375,6 @@ func expectModule(t *testing.T, ctx *android.TestContext, name, variant, expecte android.AssertPathsRelativeToTopEquals(t, "depsSrcsZips", expectedDepsSrcsZips, base.depsSrcsZips) } -var emptyFixtureFactory = android.NewFixtureFactory(nil) - func TestMain(m *testing.M) { os.Exit(m.Run()) } |