From c422e152f3046efa90bd282f3cf3754fabd0d2fe Mon Sep 17 00:00:00 2001
From: Uggla <uggla@free.fr>
Date: Mon, 7 Mar 2016 21:25:40 +0100
Subject: [PATCH 1/2] Fix setup.py

- Setup needs future module, install future using pip if not available.
---
 setup.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index 94994dd..db4d2c5 100755
--- a/setup.py
+++ b/setup.py
@@ -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

From 51c09bfd2607967dc78c4fd440df6d0be40e7f02 Mon Sep 17 00:00:00 2001
From: Uggla <uggla@free.fr>
Date: Tue, 8 Mar 2016 11:06:07 +0100
Subject: [PATCH 2/2] Remove containers used by tests

---
 redfish-client/tests/test_client.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/redfish-client/tests/test_client.py b/redfish-client/tests/test_client.py
index 1f41752..d3da332 100644
--- a/redfish-client/tests/test_client.py
+++ b/redfish-client/tests/test_client.py
@@ -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'))