Drop unit test changes

2015-03-18 20:23:12 +00:00
parent 852a062a5a
commit c6eb82d4de
3 changed files with 2 additions and 7 deletions
--- a/charm-helpers-hooks.yaml
+++ b/charm-helpers-hooks.yaml
@@ -1,5 +1,4 @@
-#branch: lp:charm-helpers
-branch: /home/ubuntu/src/charm-helpers
+branch: lp:charm-helpers
 destination: hooks/charmhelpers
 include:
    - core
--- a/charm-helpers-tests.yaml
+++ b/charm-helpers-tests.yaml
@@ -1,5 +1,4 @@
-#branch: lp:charm-helpers
-branch: /home/ubuntu/src/charm-helpers
+branch: lp:charm-helpers
 destination: tests/charmhelpers
 include:
    - contrib.amulet
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -353,6 +353,3 @@ class KeystoneBasicDeployment(OpenStackAmuletDeployment):
        if ret:
            message = "keystone config error: {}".format(ret)
            amulet.raise_status(amulet.FAIL, msg=message)
-
-    def test_force_fail(self):
-        amulet.raise_status(amulet.FAIL, msg="Forced failure!")