Skip to content

Commit 5430b92

Browse files
Moved functionality from Container and Tool classes to their respective managers (#155)
* added logging to container manager * moved container to core package * refactoring containers * fixed regressions * bug fix: added missing import * moved compile methods to container manager * removed mount_file method * moved patch method to container manager * moved interact method to container manager * moved ip_address to container manager * moved copy_to and copy_from methods to container manager * moved command method to container manager * simplified Container class * removed provision method from Bug * tidied Container class * moved provision method to container manager * added shared Docker client * increased timeout for docker client * added provision method to tools manager * bumped version
1 parent 9e116ad commit 5430b92

File tree

12 files changed

+411
-406
lines changed

12 files changed

+411
-406
lines changed

bugzoo/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from bugzoo.version import __version__
22
from bugzoo.manager import BugZoo
33
from bugzoo.core import Language, Patch
4-
from bugzoo.container import Container
4+
from bugzoo.core.container import Container
55
from bugzoo.core.bug import Bug
66
from bugzoo.core.coverage import FileLine, \
77
FileLineCoverage, \

bugzoo/cli/__init__.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -260,25 +260,26 @@ def launch(bz: 'BugZoo',
260260

261261
try:
262262
c = None
263-
c = bug.provision(tty=True,
264-
tools=tools,
265-
volumes=volumes,
266-
network_mode=network)
263+
c = bz.containers.provision(bug=bug,
264+
interactive=True,
265+
tools=tools,
266+
volumes=volumes,
267+
network_mode=network)
267268
if command is not None:
268-
stream = c.command(command, stderr=True, stdout=True, block=False)
269+
stream = bz.containers.command(c, command, stderr=True, stdout=True, block=False)
269270
for s in stream.output:
270271
print(s.decode('utf8').strip())
271272

272273
if interactive:
273-
c.interact()
274+
bz.containers.interact(c)
274275

275276
except bugzoo.core.errors.BugNotInstalledError:
276277
error("bug not installed: {}".format(bug_name))
277278

278279
# ensure that the container is always destroyed
279280
finally:
280281
if c:
281-
c.destroy()
282+
del bz.containers[c.uid]
282283

283284

284285
def build_parser():

bugzoo/container.py

Lines changed: 0 additions & 339 deletions
This file was deleted.

0 commit comments

Comments
 (0)