Merge lp:~doanac/lava-android-test/multiple-result-ids into lp:lava-android-test

[Andy Doan]

These changes allow the delete and parse commands to take multiple result ids. I've found it handy when doing test on local hardware to submit their results as one bundle rather than multiple. It was inspired a bit by how the lava-dispatcher combines bundles.

[Yongqin Liu (liuyq0307)]

Thanks, seems OK for me

review: Approve

=== modified file 'lava_android_test/commands.py'
--- lava_android_test/commands.py	2011-11-08 03:37:30 +0000
+++ lava_android_test/commands.py	2011-12-31 05:48:23 +0000
@@ -159,6 +159,13 @@
         parser.add_argument("result_id",
                             help="Test result identifier")
 
+class AndroidResultsCommand(AndroidCommand):
+    @classmethod
+    def register_arguments(self, parser):
+        super(AndroidResultsCommand, self).register_arguments(parser)
+        parser.add_argument("result_id", nargs="+",
+                            help="One or more result identifiers")
+
 class list_installed(AndroidCommand):
     """
     List installed tests for specified device.

@@ -285,19 +292,35 @@
 
         self.say_end(tip_msg)
 
-class parse(AndroidResultCommand):
+class parse(AndroidResultsCommand):
     """
     Parse the results of previous test that run on the specified device

     program:: lava-android-test parse test-result-id 
+    program:: lava-android-test parse test-result-id0 result_result-id1
     program:: lava-android-test parse test-result-id -s device_serial
     """
     def invoke(self):
-        bundle = generate_bundle(self.args.serial, self.args.result_id)
+        bundle = generate_combined_bundle(self.args.serial, self.args.result_id)
         try:
             print DocumentIO.dumps(bundle)
         except IOError:
             pass
 
+def generate_combined_bundle(serial=None, result_ids=None):
+    if result_ids is None:
+        return {}
+
+    bundle = None
+
+    for rid in result_ids:
+        b = generate_bundle(serial, rid)
+        if rid == result_ids[0]:
+            bundle = b
+        else:
+            bundle['test_runs'].append(b['test_runs'][0])
+
+    return bundle
+
 def generate_bundle(serial=None, result_id=None):
     if result_id is None:
         return {}
@@ -403,10 +426,11 @@
             self.say("Destination result name already exists")
         adb.move(srcdir, destdir)
 
-class remove(AndroidResultCommand):
+class remove(AndroidResultsCommand):
     """
     Remove the result of a previous test that run on the specified device

     program:: lava-android-test remove result-id
+    program:: lava-android-test remove result-id0 result-id1
     program:: lava-android-test remove result-id -s device_serial
     """
 
@@ -415,18 +439,22 @@
         super(remove, self).register_arguments(parser)
         group = parser.add_argument_group("force to remove")
         group.add_argument("-f", "--force",
-                            default=None,
+                            action="store_true",
                             help=("give an interactive question about remove"))
 
-    def invoke(self):
-        resultsdir = os.path.join(self.config.resultsdir_android, self.args.result_id)
-        adb = ADB(self.args.serial)
+    def remove(self, adb, rid):
+        resultsdir = os.path.join(self.config.resultsdir_android, rid)
         if not adb.exists(resultsdir):
-            self.say("No result found for '%s'" % self.args.result_id)
+            self.say("No result found for '%s'" % rid)
             return
         if not self.args.force:
-            self.say("Remove result '%s' for good? [Y/N]" % self.args.result_id)
+            self.say("Remove result '%s' for good? [Y/N]" % rid)
             response = raw_input()
             if response[0].upper() != 'Y':
                 return
         adb.rmtree(resultsdir)
+
+    def invoke(self):
+        adb = ADB(self.args.serial)
+        for rid in self.args.result_id:
+            self.remove(adb, rid)

=== modified file 'lava_android_test/testdef.py'
--- lava_android_test/testdef.py	2011-11-14 12:05:55 +0000
+++ lava_android_test/testdef.py	2011-12-31 05:48:23 +0000
@@ -488,6 +488,7 @@
     except AttributeError:
         base = mod.testobj
 
+    base.parser.results = {'test_results':[]}
     base.setadb(ADB(serial))
     return base