Merge lp:~lazypower/charms/precise/quassel-core/update-50-deploy into lp:~paulgear/charms/precise/quassel-core/trunk

[Charles Butler]

Updates the 50-deploy test to remove the side-effects of the init() method

[lp:~lazypower/charms/precise/quassel-core/update-50-deploy]

26. By Charles Butler on 2015-04-07

Corrects an oversight of a leftover self. reference in the setUpClass

=== modified file 'tests/50-basic-deploy'
--- tests/50-basic-deploy	2015-03-30 12:11:17 +0000
+++ tests/50-basic-deploy	2015-04-07 14:14:26 +0000
@@ -6,14 +6,15 @@
 
 class TestDeployment(unittest.TestCase):
 
-    def __init__(self):
+    @classmethod
+    def setUpClass(cls):
         try:
-            self.d = amulet.Deployment()
-            self.d.add('quassel-core')
-            self.d.setup(timeout=1800)
-            self.d.sentry.wait()
+            cls.d = amulet.Deployment()
+            cls.d.add('quassel-core')
+            cls.d.setup(timeout=1800)
+            cls.d.sentry.wait()
 
-            self.u = self.d.sentry.unit['quassel-core/0']
+            cls.u = cls.d.sentry.unit['quassel-core/0']
         except amulet.helpers.TimeoutError:
             amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
         except: