Factor out build_job

Author: Porges

src/integration-tests/integration-test.py

@@ -538,7 +538,7 @@ def launch(
     ) -> List[UUID]:
         """Launch all of the fuzzing templates"""
 
-        pools = {}
+        pools: dict[OS, Pool] = {}
         if unmanaged_pool is not None:
             pools[unmanaged_pool.the_os] = self.of.pools.get(unmanaged_pool.pool_name)
         else:
@@ -559,12 +559,14 @@ def launch(
 
             self.logger.info("launching: %s", target)
 
+            setup: Directory | str | None
             if config.setup_dir is None:
-                setup = (
-                    Directory(os.path.join(path, target)) if config.use_setup else None
-                )
+                if config.use_setup:
+                    setup = Directory(os.path.join(path, target))
+                else:
+                    setup = None
             else:
-                setup = config.setup_dir
+                setup = Directory(config.setup_dir)
 
             target_exe = File(os.path.join(path, target, config.target_exe))
             inputs = (
@@ -577,10 +579,31 @@ def launch(
                 setup = Directory(os.path.join(setup, config.nested_setup_dir))
 
             job: Optional[Job] = None
-            if config.template == TemplateType.libfuzzer:
-                # building the extra_setup container to test this variable substitution
-                extra_setup_container = self.of.containers.create("extra-setup")
-                job = self.of.template.libfuzzer.basic(
+            job = self.build_job(duration, pools, target, config, setup, target_exe, inputs)
+
+            if config.inject_fake_regression and job is not None:
+                self.of.debug.notification.job(job.job_id)
+
+            if not job:
+                raise Exception("missing job")
+
+            job_ids.append(job.job_id)
+
+        return job_ids
+
+    def build_job(
+            self,
+            duration: int,
+            pools: dict[OS, Pool],
+            target: str,
+            config: Integration,
+            setup: Optional[Directory],
+            target_exe: File,
+            inputs: Optional[Directory]) -> Optional[Job]:
+        if config.template == TemplateType.libfuzzer:
+            # building the extra_setup container to test this variable substitution
+            extra_setup_container = self.of.containers.create("extra-setup")
+            return self.of.template.libfuzzer.basic(
                     self.project,
                     target,
                     BUILD,
@@ -595,20 +618,20 @@ def launch(
                     fuzzing_target_options=config.fuzzing_target_options,
                     extra_setup_container=Container(extra_setup_container.name),
                 )
-            elif config.template == TemplateType.libfuzzer_dotnet:
-                if setup is None:
-                    raise Exception("setup required for libfuzzer_dotnet")
-                if config.target_class is None:
-                    raise Exception("target_class required for libfuzzer_dotnet")
-                if config.target_method is None:
-                    raise Exception("target_method required for libfuzzer_dotnet")
-
-                job = self.of.template.libfuzzer.dotnet(
+        elif config.template == TemplateType.libfuzzer_dotnet:
+            if setup is None:
+                raise Exception("setup required for libfuzzer_dotnet")
+            if config.target_class is None:
+                raise Exception("target_class required for libfuzzer_dotnet")
+            if config.target_method is None:
+                raise Exception("target_method required for libfuzzer_dotnet")
+
+            return self.of.template.libfuzzer.dotnet(
                     self.project,
                     target,
                     BUILD,
                     pools[config.os].name,
-                    target_dll=config.target_exe,
+                    target_dll=File(config.target_exe),
                     inputs=inputs,
                     setup_dir=setup,
                     duration=duration,
@@ -617,8 +640,8 @@ def launch(
                     target_class=config.target_class,
                     target_method=config.target_method,
                 )
-            elif config.template == TemplateType.libfuzzer_qemu_user:
-                job = self.of.template.libfuzzer.qemu_user(
+        elif config.template == TemplateType.libfuzzer_qemu_user:
+            return self.of.template.libfuzzer.qemu_user(
                     self.project,
                     target,
                     BUILD,
@@ -629,8 +652,8 @@ def launch(
                     vm_count=1,
                     target_options=config.target_options,
                 )
-            elif config.template == TemplateType.radamsa:
-                job = self.of.template.radamsa.basic(
+        elif config.template == TemplateType.radamsa:
+            return self.of.template.radamsa.basic(
                     self.project,
                     target,
                     BUILD,
@@ -643,8 +666,8 @@ def launch(
                     duration=duration,
                     vm_count=1,
                 )
-            elif config.template == TemplateType.afl:
-                job = self.of.template.afl.basic(
+        elif config.template == TemplateType.afl:
+            return self.of.template.afl.basic(
                     self.project,
                     target,
                     BUILD,
@@ -656,18 +679,8 @@ def launch(
                     vm_count=1,
                     target_options=config.target_options,
                 )
-            else:
-                raise NotImplementedError
-
-            if config.inject_fake_regression and job is not None:
-                self.of.debug.notification.job(job.job_id)
-
-            if not job:
-                raise Exception("missing job")
-
-            job_ids.append(job.job_id)
-
-        return job_ids
+        else:
+            raise NotImplementedError
 
     def check_task(
         self, job: Job, task: Task, scalesets: List[Scaleset]
@@ -736,15 +749,16 @@ def check_jobs(
             job_tasks[job.job_id] = tasks
             check_containers[job.job_id] = {}
             for task in tasks:
-                for container in task.config.containers:
-                    if container.type in TARGETS[job.config.name].wait_for_files:
-                        count = TARGETS[job.config.name].wait_for_files[container.type]
-                        check_containers[job.job_id][container.name] = (
-                            ContainerWrapper(
-                                self.of.containers.get(container.name).sas_url
-                            ),
-                            count,
-                        )
+                if task.config.containers:
+                    for container in task.config.containers:
+                        if container.type in TARGETS[job.config.name].wait_for_files:
+                            count = TARGETS[job.config.name].wait_for_files[container.type]
+                            check_containers[job.job_id][container.name] = (
+                                ContainerWrapper(
+                                    self.of.containers.get(container.name).sas_url
+                                ),
+                                count,
+                            )
 
         self.success = True
         self.logger.info("checking %d jobs", len(jobs))
@@ -861,16 +875,17 @@ def check_jobs_impl() -> Tuple[bool, str, bool]:
 
     def get_job_crash_report(self, job_id: UUID) -> Optional[Tuple[Container, str]]:
         for task in self.of.tasks.list(job_id=job_id, state=None):
-            for container in task.config.containers:
-                if container.type not in [
-                    ContainerType.unique_reports,
-                    ContainerType.reports,
-                ]:
-                    continue
+            if task.config.containers:
+                for container in task.config.containers:
+                    if container.type not in [
+                        ContainerType.unique_reports,
+                        ContainerType.reports,
+                    ]:
+                        continue
 
-                files = self.of.containers.files.list(container.name)
-                if len(files.files) > 0:
-                    return (container.name, files.files[0])
+                    files = self.of.containers.files.list(container.name)
+                    if len(files.files) > 0:
+                        return (container.name, files.files[0])
         return None
 
     def launch_repro(
@@ -1044,12 +1059,13 @@ def cleanup(self) -> None:
         container_names = set()
         for job in jobs:
             for task in self.of.tasks.list(job_id=job.job_id, state=None):
-                for container in task.config.containers:
-                    if container.type in [
-                        ContainerType.reports,
-                        ContainerType.unique_reports,
-                    ]:
-                        container_names.add(container.name)
+                if task.config.containers:
+                    for container in task.config.containers:
+                        if container.type in [
+                            ContainerType.reports,
+                            ContainerType.unique_reports,
+                        ]:
+                            container_names.add(container.name)
 
         for repro in self.of.repro.list():
             if repro.config.container in container_names: