livepatch-charmers team mailing list archive

[Barry Price <barry.price@xxxxxxxxxxxxx>]

Barry Price has proposed merging ~barryprice/canonical-livepatch-charm/+git/canonical-livepatch-charm:master into canonical-livepatch-charm:master.

Commit message:
Couple of misc testing fixes

Requested reviews:
  Livepatch charm developers (livepatch-charmers)

For more details, see:
https://code.launchpad.net/~barryprice/canonical-livepatch-charm/+git/canonical-livepatch-charm/+merge/345023
-- 
Your team Livepatch charm developers is requested to review the proposed merge of ~barryprice/canonical-livepatch-charm/+git/canonical-livepatch-charm:master into canonical-livepatch-charm:master.

diff --git a/tests/00-setup b/tests/00-setup
index 7d6263a..830e9a6 100755
--- a/tests/00-setup
+++ b/tests/00-setup
@@ -1,5 +1,3 @@
 #!/bin/bash
 
-sudo add-apt-repository ppa:juju/stable -y
-sudo apt-get update
-sudo apt-get install amulet -y
+pip3 install amulet juju-deployer
diff --git a/tests/99-autogen b/tests/99-autogen
index c7c1dfd..ab84340 100755
--- a/tests/99-autogen
+++ b/tests/99-autogen
@@ -48,8 +48,6 @@ class TestDeployment(unittest.TestCase):
                 amulet.SKIP,
                 msg="Environment wasn't stood up in time"
             )
-        except:
-            raise
 
     def test_install(self):
         livepatch = self.deployment.sentry['canonical-livepatch'][0]