From 4f7872da87feb05686c15497f84865d27e3ac228 Mon Sep 17 00:00:00 2001
From: shin- <joffrey@dotcloud.com>
Date: Thu, 25 Jul 2013 20:18:38 +0200
Subject: [PATCH] Fixed tests

---
 docker/client.py |  5 ++---
 tests/test.py    | 10 ++++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docker/client.py b/docker/client.py
index bb476ca5..438c7e72 100644
--- a/docker/client.py
+++ b/docker/client.py
@@ -277,8 +277,7 @@ class Client(requests.Session):
             'stderr': 1
         }
         u = self._url("/containers/{0}/attach".format(container))
-        res = self.post(u, None, params=params)
-        return res.text
+        return self._result(self.post(u, None, params=params))
 
     def port(self, container, private_port):
         res = self.get(self._url("/containers/{0}/json".format(container)))
@@ -291,7 +290,7 @@ class Client(requests.Session):
             f_port = json_['NetworkSettings']['PortMapping']['Tcp'][s_port]
 
         return f_port
-        
+
     def pull(self, repository, tag=None, registry=None):
         if repository.count(":") == 1:
             repository, tag = repository.split(":")
diff --git a/tests/test.py b/tests/test.py
index e81ce99f..7aded295 100644
--- a/tests/test.py
+++ b/tests/test.py
@@ -58,9 +58,9 @@ class TestSearch(BaseTestCase):
 class TestImages(BaseTestCase):
     def runTest(self):
         res1 = self.client.images(all=True)
-        res10 = res1[0]
+        self.assertIn('Id', res1[0])
+        res10 = [x for x in res1 if x['Id'].startswith('e9aa60c60128')][0]
         self.assertIn('Created', res10)
-        self.assertIn('Id', res10)
         self.assertIn('Repository', res10)
         self.assertIn('Tag', res10)
         self.assertEqual(res10['Tag'], 'latest')
@@ -161,14 +161,14 @@ class TestLogs(BaseTestCase):
     def runTest(self):
         snippet = 'Flowering Nights (Sakuya Iyazoi)'
         container = self.client.create_container('busybox',
-            ['echo', '-n', '{0}'.format(snippet)])
+            'echo {0}'.format(snippet))
         id = container['Id']
         self.client.start(id)
         self.tmp_containers.append(id)
         exitcode = self.client.wait(id)
         self.assertEqual(exitcode, 0)
         logs = self.client.logs(id)
-        self.assertEqual(logs, snippet)
+        self.assertEqual(logs, snippet + '\n')
 
 class TestDiff(BaseTestCase):
     def runTest(self):
@@ -255,6 +255,7 @@ class TestRemoveContainer(BaseTestCase):
 class TestPull(BaseTestCase):
     def runTest(self):
         self.client.remove_image('joffrey/test001')
+        self.client.remove_image('376968a23351')
         info = self.client.info()
         self.assertIn('Images', info)
         img_count = info['Images']
@@ -264,6 +265,7 @@ class TestPull(BaseTestCase):
         img_info = self.client.inspect_image('joffrey/test001')
         self.assertIn('id', img_info)
         self.tmp_imgs.append('joffrey/test001')
+        self.tmp_imgs.append('376968a23351')
 
 class TestCommit(BaseTestCase):
     def runTest(self):