Merge pull request #34 from uggla/fixsetup

Fix
This commit is contained in:
Bruno Cornec 2016-03-11 11:40:16 +01:00
commit de12b09115
2 changed files with 13 additions and 7 deletions

View File

@ -37,6 +37,7 @@ class DockerTest(object):
self.cli.wait(container=container.get('Id'))
response = self.cli.logs(container=container.get('Id'),
stdout=True)
self.cli.remove_container(container=container.get('Id'))
return(response.decode('utf8'))

View File

@ -1,10 +1,3 @@
from __future__ import unicode_literals
from __future__ import print_function
from __future__ import division
from __future__ import absolute_import
from future import standard_library
standard_library.install_aliases()
from builtins import object
#!/usr/bin/env python
# Licensed under the Apache License, Version 2.0 (the 'License');
# you may not use this file except in compliance with the License.
@ -20,11 +13,23 @@ from builtins import object
# limitations under the License.
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
from __future__ import unicode_literals
from __future__ import print_function
from __future__ import division
from __future__ import absolute_import
import os
import sys
import fileinput
import re
import pprint
from subprocess import check_call
try:
from future import standard_library
except ImportError:
check_call(["pip", "install", "future"])
from future import standard_library
standard_library.install_aliases()
from builtins import object
import distutils
import configparser
import setuptools