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
diff --git a/python/python_test.go b/python/python_test.go
index 6263c8a..f57f504 100644
--- a/python/python_test.go
+++ b/python/python_test.go
@@ -335,13 +335,12 @@
}
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 @@
android.AssertPathsRelativeToTopEquals(t, "depsSrcsZips", expectedDepsSrcsZips, base.depsSrcsZips)
}
-var emptyFixtureFactory = android.NewFixtureFactory(nil)
-
func TestMain(m *testing.M) {
os.Exit(m.Run())
}