From 070efe2c8f10385c33e77cf6b3f97c8b9a626a06 Mon Sep 17 00:00:00 2001
From: Mike Scherbakov <mihgen@gmail.com>
Date: Thu, 14 Jun 2012 16:37:54 +0400
Subject: [PATCH] Mocked SshConnect for config handler test

---
 .gitignore                             | 3 ---
 nailgun/nailgun/api/handlers.py        | 3 +--
 nailgun/nailgun/tests/test_handlers.py | 9 +++++++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index b5bb6802d1..9bfde8a4fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,3 @@
 
 # Vagrant housekeeping file
 /.vagrant
-
-# artifact from config handler
-080000000001.json
diff --git a/nailgun/nailgun/api/handlers.py b/nailgun/nailgun/api/handlers.py
index c2dbd41981..4e605250dc 100644
--- a/nailgun/nailgun/api/handlers.py
+++ b/nailgun/nailgun/api/handlers.py
@@ -47,8 +47,7 @@ class TaskHandler(BaseHandler):
             "status": task.state,
         }
 
-        # return string representation of the exception if failed
-        json_data['results'] = [str(t.result) for t in task.result.results]
+        json_data['results'] = [t.result for t in task.result.results]
 
         return json_data
 
diff --git a/nailgun/nailgun/tests/test_handlers.py b/nailgun/nailgun/tests/test_handlers.py
index f881be5ea4..14a3b5762f 100644
--- a/nailgun/nailgun/tests/test_handlers.py
+++ b/nailgun/nailgun/tests/test_handlers.py
@@ -1,4 +1,5 @@
 import simplejson as json
+import mock
 from django import http
 from django.test import TestCase
 from django.db.models import Model
@@ -392,13 +393,17 @@ class TestHandlers(TestCase):
         recipes = [r.recipe for r in roles_from_db[0].recipes.all()]
         self.assertEquals(set(role_recipes), set(recipes))
 
-    def test_jsons_created_for_chef_solo(self):
+    @mock.patch('nailgun.tasks.SshConnect')
+    def test_jsons_created_for_chef_solo(self, ssh_mock):
         url = reverse('config_handler', kwargs={'cluster_id': 1})
+        ssh = ssh_mock.return_value
+        ssh.run.return_value = True
         resp = self.client.post(url)
-        print resp.content
         self.assertEquals(resp.status_code, 202)
         resp_json = json.loads(resp.content)
         self.assertEquals(len(resp_json['task_id']), 36)
+        for node in resp_json['results']:
+            self.assertEquals(node.values()[0], True)
 
     def test_validate_node_role_available(self):
         url = reverse('node_role_available', kwargs={