Merge pull request #125 from srautiai/devel

Devel to master

Author: Sakari Rautiainen

CHANGELOG

@@ -1,3 +1,5 @@
+2.69.2
+ * Added method to list devices from device groups
 2.69.1
  * Added warning about deprecated methods
  * Upload returns as json 

setup.py

@@ -3,7 +3,7 @@
 import sys, os
 
 
-version = '2.69.1'
+version = '2.69.2'
 
 setup(name='testdroid',
       version=version,

testdroid/__init__.py

@@ -11,7 +11,7 @@
 from optparse import OptionParser
 from datetime import datetime
 
-__version__ = '2.69.1'
+__version__ = '2.69.2'
 
 FORMAT = "%(message)s"
 logging.basicConfig(format=FORMAT)
@@ -290,6 +290,14 @@ def get_me(self):
     def get_device_groups(self, limit=0):
         return self.get("me/device-groups", payload = {'limit': limit})
 
+    """ Returns list of devices from device group
+    """
+    def get_devices_from_group(self, device_group_id, limit=0):
+        me = self.get_me()
+        path = "users/%s/device-groups/%s/devices" % (me['id'], device_group_id)
+        return self.get(path, payload = {'limit': limit})
+
+
     """ Returns list of frameworks
     """
     def get_frameworks(self, limit=0):