Fixed regression in "bug validate" and compilers caused by container -> container manager API migration (#156)

* tweaked BugManager.validate to use container manager for provisioning

* temporary fix for compiling programs

* version bump

Author: ChrisTimperley

bugzoo/compiler/__init__.py

@@ -112,27 +112,32 @@ def __init__(self,
         self.__time_limit = time_limit
 
     def __compile(self,
+                  manager_container,
                   container: 'Container',
                   command: str,
                   verbose: bool
                   ) -> CompilationOutcome:
         # if a context isn't given, use the source directory of the bug
         context = self.__context if self.__context else container.bug.source_dir
-        cmd_outcome = container.command(command,
-                                        context=context,
-                                        stderr=True)
+        cmd_outcome = manager_container.command(container,
+                                                command,
+                                                context=context,
+                                                stderr=True)
         return CompilationOutcome(cmd_outcome)
 
+    # TODO decouple!
     def compile(self,
+                manager_container,
                 container: 'Container',
                 verbose: bool = False
                 ) -> CompilationOutcome:
         """
         See `Compiler.compile`
         """
-        return self.__compile(container, self.__command, verbose)
+        return self.__compile(manager_container, container, self.__command, verbose)
 
     def compile_with_coverage_instrumentation(self,
+                                              manager_container,
                                               container: 'Container',
                                               verbose: bool = False
                                               ) -> CompilationOutcome:
@@ -144,7 +149,7 @@ def compile_with_coverage_instrumentation(self,
         else:
             cmd = self.__command
 
-        return self.__compile(container, cmd, verbose)
+        return self.__compile(manager_container, container, cmd, verbose)
 
 
 class CatkinCompiler(SimpleCompiler):

bugzoo/mgr/bug.py

@@ -136,7 +136,7 @@ def validate(self, bug: Bug, verbose: bool = True) -> bool:
         validated = True
         try:
             c = None
-            c = bug.provision()
+            c = self.__installation.containers.provision(bug)
 
             # ensure we can compile the bug
             # TODO: check compilation status!
@@ -175,6 +175,6 @@ def validate(self, bug: Bug, verbose: bool = True) -> bool:
         # ensure that the container is destroyed!
         finally:
             if c:
-                c.destroy()
+                del self.__installation.containers[c.uid]
 
         return validated

bugzoo/mgr/container.py

@@ -252,6 +252,7 @@ def coverage(self,
         extractor = language.coverage_extractor
         return extractor.coverage(self, container, tests)
 
+    # TODO decouple
     def compile(self,
                 container: Container,
                 verbose: bool = False
@@ -269,8 +270,9 @@ def compile(self,
         """
         # TODO use container name
         bug = container.bug # self.__installation.bugs[container.bug]
-        return bug.compiler.compile(container, verbose=verbose)
+        return bug.compiler.compile(self, container, verbose=verbose)
 
+    # TODO decouple
     def compile_with_instrumentation(self,
                                      container: Container,
                                      verbose: bool = False
@@ -282,7 +284,8 @@ def compile_with_instrumentation(self,
         See: `Container.compile`
         """
         bug = self.__installation.bugs[container.bug]
-        return bug.compiler.compile_with_coverage_instrumentation(container,
+        return bug.compiler.compile_with_coverage_instrumentation(self,
+                                                                  container,
                                                                   verbose=verbose)
 
     def copy_to(self,
@@ -335,10 +338,11 @@ def command(self,
         cmd = template_cmd.format(context, cmd)
 
         # based on: https://github.com/roidelapluie/docker-py/commit/ead9ffa34193281967de8cc0d6e1c0dcbf50eda5
-        response = self.__docker_client.api.exec_create(container.id,
-                                                        cmd,
-                                                        stdout=stdout,
-                                                        stderr=stderr)
+        docker_client = self.__installation.docker
+        response = docker_client.api.exec_create(container.id,
+                                                 cmd,
+                                                 stdout=stdout,
+                                                 stderr=stderr)
 
         # blocking mode
         if block:

bugzoo/version.py

@@ -1 +1 @@
-__version__ = '2.0.1'
+__version__ = '2.0.2'