Refactor new sweeper tests

GoogleCloudPlatform · Mar 1, 2024 · 133405c · 133405c
1 parent 0fb9312
commit 133405c
Showing 1 changed file with 3 additions and 16 deletions.
diff --git a/mmv1/third_party/terraform/.teamcity/tests/sweepers.kt b/mmv1/third_party/terraform/.teamcity/tests/sweepers.kt
@@ -71,14 +71,8 @@ class SweeperTests {
         val project = googleCloudRootProject(testContextParameters())
 
         // Find GA nightly test project
-        val gaProject: Project? =  project.subProjects.find { p->  p.name == gaProjectName}
-        if (gaProject == null) {
-            Assert.fail("Could not find the Google (GA) project")
-        }
-        val gaNightlyTestProject: Project? = gaProject!!.subProjects.find { p->  p.name == nightlyTestsProjectName}
-        if (gaNightlyTestProject == null) {
-            Assert.fail("Could not find the Google (GA) Nightly Test project")
-        }
+        val gaNightlyTestProject = getSubProject(project, gaProjectName, nightlyTestsProjectName)
+
 
         // Find sweeper inside
         val sweeper: BuildType? = gaNightlyTestProject!!.buildTypes.find { p-> p.name == ServiceSweeperName}
@@ -96,14 +90,7 @@ class SweeperTests {
         val project = googleCloudRootProject(testContextParameters())
 
         // Find Beta nightly test project
-        val betaProject: Project? =  project.subProjects.find { p->  p.name == betaProjectName}
-        if (betaProject == null) {
-            Assert.fail("Could not find the Google (GA) project")
-        }
-        val betaNightlyTestProject: Project? = betaProject!!.subProjects.find { p->  p.name == nightlyTestsProjectName}
-        if (betaNightlyTestProject == null) {
-            Assert.fail("Could not find the Google (GA) Nightly Test project")
-        }
+        val betaNightlyTestProject = getSubProject(project, betaProjectName, nightlyTestsProjectName)
 
         // Find sweeper inside
         val sweeper: BuildType? = betaNightlyTestProject!!.buildTypes.find { p-> p.name == ServiceSweeperName}