From 332e7e8473d38566b3b58b3ac8c52ad8498372e7 Mon Sep 17 00:00:00 2001
From: Alberto Donato <alberto.donato@canonical.com>
Date: Thu, 6 Aug 2015 11:26:19 +0200
Subject: [PATCH] Fix test.

---
 tests/053-basic-pause-and-resume | 30 +++++++++++++++++++++++++++---
 tests/basic_deployment.py        |  5 -----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/tests/053-basic-pause-and-resume b/tests/053-basic-pause-and-resume
index 910ba553..e291e736 100755
--- a/tests/053-basic-pause-and-resume
+++ b/tests/053-basic-pause-and-resume
@@ -6,10 +6,35 @@ import subprocess
 import time
 import yaml
 
-import basic_deployment
+from charmhelpers.contrib.openstack.amulet.deployment import (
+    OpenStackAmuletDeployment
+)
 
 
-class PauseResume(basic_deployment.KeystoneBasicDeployment):
+class PauseResume(OpenStackAmuletDeployment):
+
+    def __init__(self, series=None, openstack=None,
+                 source=None, stable=False):
+        """Deploy the entire test environment."""
+        super(PauseResume, self).__init__(series, openstack, source, stable)
+
+        # Deploy only keystone
+        self._add_services()
+        self._configure_services()
+        self._deploy()
+
+    def is_keystone_running(self, unit):
+        """Return whether the keystone unit is running."""
+        _, code = unit.run("service keystone status | grep -q running")
+        return code == 0
+
+    def _add_services(self):
+        super(PauseResume, self)._add_services({"name": "keystone"}, [])
+
+    def _configure_services(self):
+        config = {"admin-password": "openstack",
+                  "admin-token": "ubuntutesting"}
+        super(PauseResume, self)._configure_services({"keystone": config})
 
     def _run_action(self, unit_id, action, *args):
         command = ["juju", "action", "do", unit_id, action]
@@ -40,7 +65,6 @@ class PauseResume(basic_deployment.KeystoneBasicDeployment):
             time.sleep(2)
 
     def run(self):
-        super(PauseResume, self).run()
         unit_name = "keystone/0"
         unit = self.d.sentry.unit[unit_name]
         assert self.is_keystone_running(unit), \
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 3a5752ad..bf5dd7c1 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -38,11 +38,6 @@ class KeystoneBasicDeployment(OpenStackAmuletDeployment):
         self._deploy()
         self._initialize_tests()
 
-    def _is_keystone_running(self, unit):
-        """Return whether the keystone unit is running."""
-        _, code = unit.run("pidof keystone")
-        return code == 0
-
     def _add_services(self):
         """Add services