fix ADBLogWatch instance

magneto/utils/adb.py

@@ -171,6 +171,11 @@ def __init__(self):
         self._watchers = {}
         self.asked_to_stop = False
 
+        if self.__class__.instance is not None:
+            raise RuntimeError('Only one instance of {} is allowed at any time.'.format(self.__class__.__name__))
+
+        self.__class__.instance = self
+
     @classmethod
     def wrap(cls, fn):
         @wraps(fn)
@@ -181,16 +186,11 @@ def wrapper(instance, *args, **kwargs):
         return wrapper
 
     def __enter__(self, *_):
-        if self.__class__.instance is not None:
-            raise RuntimeError('Only one instance of {} is allowed at any time.'.format(self.__class__.__name__))
-
-        self.__class__.instance = self
         self.start()
         return self
 
     def __exit__(self, *_):
         self.exit()
-        self.__class__.instance = None
 
     def run(self):
         p = ADB.exec_cmd('logcat', stdout=subprocess.PIPE)
@@ -213,6 +213,7 @@ def run(self):
         Logger.debug('ADB logcat process terminated')
 
     def exit(self):
+        self.__class__.instance = None
         self.asked_to_stop = True
         self.join()
 

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='magneto',
-    version='0.31',
+    version='0.31.1',
     description='Magneto - Test Automation for Android',
     author='EverythingMe',
     author_email='automation@everything.me',