Fixed multiple ---PROFILEDATA--- found in Gfxinfo framestats

dtmilano · dtmilano · commit e82c8d478495 · 2017-03-31T13:17:50.000+08:00
- Remove sys.argv entries when test run by  utrunner.py
diff --git a/.idea/runConfigurations/Unittests_in_DumpsysTests.xml b/.idea/runConfigurations/Unittests_in_DumpsysTests.xml
diff --git a/src/com/dtmilano/android/adb/dumpsys.py b/src/com/dtmilano/android/adb/dumpsys.py
@@ -17,8 +17,9 @@
 @author: Diego Torres Milano
 '''
 import re
+from _warnings import warn
 
-__version__ = '13.1.9'
+__version__ = '13.1.10'
 
 
 class Dumpsys:
@@ -45,8 +46,11 @@ def __init__(self, adbclient, subcommand, *args):
             args_str = ' '.join(args)
         else:
             args_str = ''
-        cmd = 'dumpsys ' + subcommand + (' ' + args_str if args_str else '')
-        self.parse(adbclient.shell(cmd), subcommand, *args)
+        if adbclient:
+            cmd = 'dumpsys ' + subcommand + (' ' + args_str if args_str else '')
+            self.parse(adbclient.shell(cmd), subcommand, *args)
+        else:
+            warn('No adbclient specified')
 
     @staticmethod
     def listSubCommands(adbclient):
@@ -104,21 +108,25 @@ def parseGfxinfo(self, out):
 
     def parseGfxinfoFramestats(self, out):
         pd = '---PROFILEDATA---'
-        m = re.search(r'%s.*?%s' % (pd, pd), out, re.DOTALL)
-        if m:
-            pdc = 0
-            for d in m.group(0).splitlines():
-                pda = d.split(',')
-                if pda[0] == pd:
-                    continue
-                if pda[0] == 'Flags':
-                    if pda[1] != 'IntendedVsync' and pda[13] != 'FrameCompleted':
-                        raise RuntimeError('Unsupported gfxinfo version')
+        l = re.findall(r'%s.*?%s' % (pd, pd), out, re.DOTALL)
+        if l:
+            s = ''
+            for e in l:
+                if not e:
                     continue
-                if pda[0] == '0':
-                    # Only keep lines with Flags=0
-                    self.gfxProfileData.append(pda[:-1])
-                    self.framestats.append(int(pda[13]) - int(pda[1]))
+                sl = e.splitlines()
+                for s in sl:
+                    if s == pd:
+                        continue
+                    pda = s.split(',')
+                    if pda[0] == 'Flags':
+                        if pda[1] != 'IntendedVsync' and pda[13] != 'FrameCompleted':
+                            raise RuntimeError('Unsupported gfxinfo version')
+                        continue
+                    if pda[0] == '0':
+                        # Only keep lines with Flags=0
+                        self.gfxProfileData.append(pda[:-1])
+                        self.framestats.append(int(pda[13]) - int(pda[1]))
         else:
             raise RuntimeError('No profile data found')
 
diff --git a/src/com/dtmilano/android/viewclient.py b/src/com/dtmilano/android/viewclient.py
@@ -4494,6 +4494,9 @@ def setUp(self):
                     else:
                         raise RuntimeError('serial number missing')
                 i += 1
+            # remove the test runner arguments, otherwise they will be found by connectToDeviceOrExit()
+            sys.argv.remove(testname)
+            sys.argv.remove(testargs)
 
         if self.serialno:
             # serialno can be 1 serialno, multiple serialnos, 'all' or 'default'
diff --git a/tests/com/dtmilano/android/adb/dumpsystests2.py b/tests/com/dtmilano/android/adb/dumpsystests2.py
@@ -1,7 +1,15 @@
 from __future__ import absolute_import
 
+import os
 import unittest
 
+import sys
+
+try:
+    sys.path.insert(0, os.path.join(os.environ['ANDROID_VIEW_CLIENT_HOME'], 'src'))
+except:
+    pass
+
 from com.dtmilano.android.adb import adbclient
 from com.dtmilano.android.adb.dumpsys import Dumpsys
 
@@ -47,8 +55,39 @@ def test_get_activities(self):
     def test_gfxinfo_1(self):
         self.assertGreater(len(self.dumpsysGfxinfo.gfxProfileData), 0)
 
-    def test_gfxinfo_2(self):
-        self.assertGreater(len(self.dumpsysGfxinfo.gfxProfileDataDiff), 0)
+    # def test_gfxinfo_2(self):
+    #     self.assertGreater(len(self.dumpsysGfxinfo.gfxProfileDataDiff), 0)
+
+    def test_parseGfxinfoFramestats(self):
+        out = '''\
+Something
+Something
+Something
+Something
+
+---PROFILEDATA---
+Flags,IntendedVsync,Vsync,OldestInputEvent,NewestInputEvent,HandleInputStart,AnimationStart,PerformTraversalsStart,DrawStart,SyncQueued,SyncStart,IssueDrawCommandsStart,SwapBuffers,FrameCompleted,
+0,1538750837982,1539034171304,9223372036854775807,0,1539047401632,1539047424965,1539047516299,1539047541049,1539047873632,1539048042382,1539048073215,1539085917465,1539087148465,
+0,1808866542439,1808899875771,9223372036854775807,0,1808909338401,1808909869234,1808911205068,1808911288234,1808911729484,1808911906651,1808912287651,1808920894568,1808922659568,
+---PROFILEDATA---
+
+Something
+Something
+Something
+Something
+Something
+
+---PROFILEDATA---
+Flags,IntendedVsync,Vsync,OldestInputEvent,NewestInputEvent,HandleInputStart,AnimationStart,PerformTraversalsStart,DrawStart,SyncQueued,SyncStart,IssueDrawCommandsStart,SwapBuffers,FrameCompleted,
+1,1538295812863,1538495812855,9223372036854775807,0,1538506027632,1538506079049,1538506994882,1538517724382,1538550285632,1538550403216,1538550458966,1538559445132,1538561759382,
+---PROFILEDATA---
+
+
+
+
+        '''
+        dumpsys = Dumpsys(None, None)
+        dumpsys.parseGfxinfoFramestats(out)
 
 
 if __name__ == '__main__':
