Merge lp:~le-chi-thu/lava-dispatcher/override-test-options into lp:lava-dispatcher

[Le Chi Thu]

Added support for test_options in lava_test_run command.

   {
      "command": "lava_test_run",
      "parameters":
        {
          "test_name": "peacekeeper",
          "test_options": "firefox"
        }
    }

See the doc/test_with_testoptions.json as an example.

[Spring Zhang (qzhang)]

Did you have a test? Notice the following code, I'm not sure if it could fail?
40 return super(cmd_lava_test_run, self).test_name() + ' (%s)' % test_name

review: Approve

[Le Chi Thu (le-chi-thu)]

yes. I tested it and it works

/Chi Thu

On 19 October 2011 12:37, Spring Zhang <email address hidden> wrote:

> Review: Approve
>
> Did you have a test? Notice the following code, I'm not sure if it could
> fail?
> 40 return super(cmd_lava_test_run, self).test_name() + ' (%s)' %
> test_name
> --
>
> https://code.launchpad.net/~le-chi-thu/lava-dispatcher/override-test-options/+merge/79784
> You are the owner of lp:~le-chi-thu/lava-dispatcher/override-test-options.
>

[Paul Larson (pwlars)]

54 + if test_options != "":
55 + test_options = "-t " + test_options
I assume you will need to add quotes around the test_options, or else multiple options will not work right?

[lp:~le-chi-thu/lava-dispatcher/override-test-options]

140. By Le Chi Thu <email address hidden> <email address hidden> on 2011-10-20

Added single quote -t options of lava-test

=== added file 'doc/test_with_testoptions.json'
--- doc/test_with_testoptions.json	1970-01-01 00:00:00 +0000
+++ doc/test_with_testoptions.json	2011-10-20 12:18:17 +0000
@@ -0,0 +1,25 @@
+{
+  "job_name": "foo",
+  "target": "panda01",
+  "timeout": 18000,
+  "actions": [
+    {
+      "command": "lava_test_install",
+      "parameters":
+        {
+            "tests": ["peacekeeper"]
+        }
+    },
+    {
+      "command": "boot_linaro_image"
+    },
+    {
+      "command": "lava_test_run",
+      "parameters":
+        {
+          "test_name": "peacekeeper",
+          "test_options": "firefox"
+        }
+    }
+  ]
+}

=== modified file 'lava_dispatcher/actions/lava-test.py'
--- lava_dispatcher/actions/lava-test.py	2011-10-18 02:38:34 +0000
+++ lava_dispatcher/actions/lava-test.py	2011-10-20 12:18:17 +0000
@@ -84,10 +84,10 @@
 
 class cmd_lava_test_run(BaseAction):
 
-    def test_name(self, test_name, timeout=-1):
+    def test_name(self, test_name, test_options = "", timeout=-1):
         return super(cmd_lava_test_run, self).test_name() + ' (%s)' % test_name
     
-    def run(self, test_name, timeout=-1):
+    def run(self, test_name, test_options = "", timeout=-1):
         logging.info("Executing lava_test_run %s command" % test_name)
         #Make sure in test image now
         client = self.client
@@ -95,8 +95,12 @@
         client.run_cmd_tester('mkdir -p %s' % self.context.lava_result_dir)
         client.export_display()
         bundle_name = test_name + "-" + datetime.now().strftime("%H%M%S")
-        cmd = ('lava-test run %s -o %s/%s.bundle' % (
-                test_name, self.context.lava_result_dir, bundle_name))
+
+        if test_options != "":
+            test_options = "-t '%s'" % test_options
+            
+        cmd = ('lava-test run %s %s -o %s/%s.bundle' % (
+                test_name, test_options, self.context.lava_result_dir, bundle_name))
         try:
             rc = client.run_cmd_tester(cmd, timeout=timeout)
         except: