Merge lp:~kissiel/checkbox/verbosity-settings-in-cbt into lp:checkbox

[Maciej Kisielewski]

This MR fixes a few design problems that were required to bring --quiet mode in. See log for details. After those fixes are applied it introduces the quiet mode and makes autopilot use it.

0e0ddb1 checkbox-touch: move initialization of pyotherside to init()
5f044fb checkbox-touch: add 'initiated' signal to Python{} object
9244cc7 checkbox-touch: make components using Py to wait for py.onInitiated
f1bb1c7 checkbox-touch: move py.init() to mainView.onCompleted
33e25cb checkbox-touch: make loading of settings.json append, not overwrite
712ba49 checkbox-touch: initiating logger now requires default logging level
3351f21 checkbox-touch: add --quiet option to the app
9679197 checkbox-touch: imply quiet mode when running autopilot
99b4924 checkbox-touch: add semicolons in the JS bits

[Zygmunt Krynicki (zyga)]

13:02 < zyga> kissiel: http://bazaar.launchpad.net/~kissiel/checkbox/verbosity-settings-in-cbt/revision/3870 this is a bit iffy
13:02 < zyga> kissiel: but everything else in that branch is great
13:02 < zyga> kissiel: I don't know how to improve it, it just ... meh, javascript is so crap, we'd have to roll or own logging library
13:03 < zyga> kissiel: or import something external

review: Approve

=== modified file 'checkbox-touch/checkbox-touch.qml'
--- checkbox-touch/checkbox-touch.qml	2015-06-25 15:42:19 +0000
+++ checkbox-touch/checkbox-touch.qml	2015-07-02 12:54:55 +0000
@@ -69,13 +69,19 @@
             help: i18n.tr("Run Checkbox-Touch in autopilot-testing mode")
             required: false
         }
+        Argument {
+            name: "quiet"
+            help: i18n.tr("Write only warnings and errors to standard error")
+            required: false
+        }
     }
 
     Component.onCompleted: {
         if (args.values["autopilot"]) {
             // autopilot-testing mode
-            appSettings["testplan"] = "2015.com.canonical.certification::checkbox-touch-autopilot"
-            appSettings["providersDir"] = "tests/autopilot/autopilot-provider"
+            appSettings["testplan"] = "2015.com.canonical.certification::checkbox-touch-autopilot";
+            appSettings["providersDir"] = "tests/autopilot/autopilot-provider";
+            appSettings["log-level"] = "warning";
         } else {
             // normal execution - load settings.json file
             var xhr = new XMLHttpRequest;
@@ -83,37 +89,48 @@
             xhr.onreadystatechange = function() {
                 if (xhr.readyState == XMLHttpRequest.DONE) {
                     try {
-                        appSettings = JSON.parse(xhr.responseText);
+                        var newAppSettings = JSON.parse(xhr.responseText);
                     } catch (x) {
                         // if we cannot parse settings.json, we should leave
                         // deafult values of appSettings
-                        console.log("Could not parse settings.json. Using default values")
+                        console.error("Could not parse settings.json. Using default values");
+                    }
+                    // overwrite/add appSettings' attributes that got loaded
+                    for (var attr in newAppSettings) {
+                        appSettings[attr] = newAppSettings[attr];
                     }
                 }
             }
             xhr.send();
         }
+        if (args.values["quiet"]) {
+            // monkey-patch console.log and console.info to do nothing
+            console.log = function() {};
+            console.info = function() {};
+            appSettings["log-level"] = "warning";
+        }
+        py.init()
     }
 
 
     // Pyotherside python object that we use to talk to all of plainbox
     Python {
         id: py
-        Component.onCompleted: {
+
+        function init() {
             console.log("Pyotherside version " + pluginVersion());
             console.log("Python version " + pythonVersion());
             // A bit hacky but that's where the python code is
             addImportPath(Qt.resolvedUrl('py/'));
             // Import path for plainbox and potentially other python libraries
             addImportPath(Qt.resolvedUrl('lib/py'))
-            // Import the checkbox_touch module on startup then call the
-            // create_app_object() function and assign the resulting handle
-            // back to the application component.
-            py.importModule("checkbox_touch", function() {
-                app.construct("checkbox_touch.create_app_object", [])
-            });
             setHandler('command_output', commandOutputPage.addText);
+            initiated();
         }
+
+        // gets triggered when python object is ready to be used
+        signal initiated
+
         onError: {
             console.error("python error: " + traceback);
             ErrorLogic.showError(mainView, "python error: " + traceback, Qt.quit);
@@ -137,15 +154,23 @@
         onSessionReady: {
             welcomePage.enableButton()
         }
+        Component.onCompleted: {
+            // register to py.initiated signal
+            py.onInitiated.connect(function() {
+                construct("checkbox_touch.create_app_object", []);
+            });
+        }
     }
 
     PythonLogger {
         id: logger
         py: py
         Component.onCompleted: {
-            py.Component.onCompleted.connect(function() {
+            // register to py.initiated signal
+            py.onInitiated.connect(function() {
                 py.importModule("checkbox_touch", function() {
-                    construct("checkbox_touch.get_qml_logger", []);
+                    construct("checkbox_touch.get_qml_logger",
+                             [appSettings["log-level"] || "info"]);
                 });
             });
         }

=== modified file 'checkbox-touch/py/checkbox_touch.py'
--- checkbox-touch/py/checkbox_touch.py	2015-06-25 15:42:19 +0000
+++ checkbox-touch/py/checkbox_touch.py	2015-07-02 12:54:55 +0000
@@ -657,8 +657,15 @@
         self._password = password
 
 
-def get_qml_logger():
-    logging.basicConfig(level=logging.INFO, stream=sys.stderr)
+def get_qml_logger(default_level):
+    logging_level = collections.defaultdict(lambda:logging.INFO, {
+        "debug": logging.DEBUG,
+        "warning": logging.WARNING,
+        "warn": logging.WARN,
+        "error": logging.ERROR,
+        "critical": logging.CRITICAL,
+        "fatal": logging.FATAL})[default_level.lower()]
+    logging.basicConfig(level=logging_level, stream=sys.stderr)
     return logging.getLogger('checkbox.touch.qml')