Merge lp:~jonas-drange/ubuntu-system-settings/add-usc-test-dep into lp:ubuntu-system-settings

[Jonas G. Drange]

adds test dep on usc

[lp:~jonas-drange/ubuntu-system-settings/add-usc-test-dep]

1660. By Jonas G. Drange on 2016-10-19

add usc test dep

1661. By Jonas G. Drange on 2016-10-19

be specific of version in usc test dep

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1729
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/215/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1866/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1867
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1707
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1707/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1707
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1707/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1707
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1707/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1707
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1707/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1707
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1707/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1707
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1707/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1707
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1707/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1707
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1707/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1707/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/215/rebuild

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/add-usc-test-dep]

1662. By Jonas G. Drange on 2016-10-19

merge prereq

1663. By Jonas G. Drange on 2016-10-19

bump test dep

Unmerged revisions

1663. By Jonas G. Drange on 2016-10-19

bump test dep

1662. By Jonas G. Drange on 2016-10-19

merge prereq

1661. By Jonas G. Drange on 2016-10-19

be specific of version in usc test dep

1660. By Jonas G. Drange on 2016-10-19

add usc test dep

1659. By Jonas G. Drange on 2016-10-18

apply filepicker patch

=== modified file 'debian/control'
--- debian/control	2016-09-30 13:48:06 +0000
+++ debian/control	2016-10-19 07:36:02 +0000
@@ -45,7 +45,8 @@
                dpkg-dev,
                qml-module-qttest,
                qml-module-qtquick2,
-               qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
+               qml-module-ubuntu-components | qml-module-ubuntu-components-gles,
+               qtdeclarative5-ubuntu-settings-components,
                libubuntuoneauth-2.0-dev,
                libqtdbusmock1-dev (>= 0.2+14.04.20140724),
                libqtdbustest1-dev,
@@ -95,8 +96,8 @@
          qml-module-ofono (>=0.90~),
          qml-module-qtsysteminfo,
          qtdeclarative5-ubuntu-content1,
-         qtdeclarative5-ubuntu-settings-components (>= 0.8),
-         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1584) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1584),
+         qtdeclarative5-ubuntu-settings-components (>= 0.9),
+         qml-module-ubuntu-components (>= 1.3.1584) | qml-module-ubuntu-components-gles (>= 1.3.1584),
          suru-icon-theme (>= 14.04+15.04.20150813~),
          whoopsie-preferences (>= 0.9),
          libsystemsettings1 (= ${binary:Version}),
 
=== modified file 'plugins/wifi/CMakeLists.txt'
--- plugins/wifi/CMakeLists.txt	2016-08-16 23:50:33 +0000
+++ plugins/wifi/CMakeLists.txt	2016-10-19 07:36:02 +0000
@@ -1,7 +1,6 @@
 set(QML_SOURCES
 AccessPoint.qml
 BaseMenuItem.qml
-CertPicker.qml
 CertDialog.qml
 Common.qml
 DivMenuItem.qml
 
=== modified file 'plugins/wifi/CertDialog.qml'
--- plugins/wifi/CertDialog.qml	2015-08-10 13:31:45 +0000
+++ plugins/wifi/CertDialog.qml	2016-10-19 07:36:02 +0000
@@ -27,6 +27,30 @@
             }
         }
 
+        Component {
+            id: failedToImportComponent
+            Dialog {
+                id: failedToImportDialog
+                title: {
+                    if (certType === 0) { // certificate
+                        return i18n.tr("Could not save certificate.")
+                    } else if (certType === 1) { // privatekey
+                        return i18n.tr("Could not save key.")
+                    } else if (certType === 2) { // pacFile
+                        return i18n.tr("Could not save pack file.")
+                    }
+                }
+
+                Button {
+                    text: i18n.tr("OK")
+                    onClicked: {
+                        PopupUtils.close(failedToImportDialog);
+                        PopupUtils.close(certDialog);
+                    }
+                }
+            }
+        }
+
         FileHandler {
             id: fileHandler
         }
@@ -64,7 +88,6 @@
                 Layout.fillWidth: true
                 text: i18n.tr("Cancel")
                 onClicked: {
-                    fileHandler.removeFile(certDialog.fileName);
                     PopupUtils.close(certDialog);
                 }
             }
@@ -74,19 +97,23 @@
                 text: i18n.tr("Save")
                 Layout.fillWidth: true
                 enabled: (certDialog.certContent.text !== "")
-                onClicked: { if (certType === 0) { // certificate
-                        fileHandler.moveCertFile(certDialog.fileName);
+                onClicked: {
+                    var ret;
+                    if (certType === 0) { // certificate
+                        ret = fileHandler.copyCertFile(certDialog.fileName);
                     } else if (certType === 1) { // privatekey
-                        fileHandler.moveKeyFile(certDialog.fileName);
+                        ret = fileHandler.copyKeyFile(certDialog.fileName);
                     } else if (certType === 2) { // pacFile
-                        fileHandler.movePacFile(certDialog.fileName);
+                        ret = fileHandler.copyPacFile(certDialog.fileName);
                     }
 
-                    /* Just to be sure source file will be deleted if move was
-                    not successfull */
-                    fileHandler.removeFile(certDialog.fileName);
-                    certDialog.updateSignal(true);
-                    PopupUtils.close(certDialog);
+                    // If the cert/key/pac doesn't compute, warn.
+                    if (!ret) {
+                        PopupUtils.open(failedToImportComponent);
+                    } else {
+                        certDialog.updateSignal(true);
+                        PopupUtils.close(certDialog);
+                    }
                 }
             }
         }
 
=== removed file 'plugins/wifi/CertPicker.qml'
--- plugins/wifi/CertPicker.qml	2016-03-16 16:26:18 +0000
+++ plugins/wifi/CertPicker.qml	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 1.3
-import Ubuntu.Content 1.3
-
-PopupBase  {
-    id: picker
-
-    signal fileImportSignal (var file)
-    property var activeTransfer
-
-    Rectangle {
-        anchors.fill: parent
-
-        ContentTransferHint {
-            id: transferHint
-            anchors.fill: parent
-            activeTransfer: picker.activeTransfer
-        }
-
-        ContentStore {
-            id: appStore
-            scope: ContentScope.App
-        }
-
-        ContentPeerPicker {
-            id: peerPicker
-            anchors.fill: parent
-            visible: true
-            contentType: ContentType.Documents
-            handler: ContentHandler.Source
-            onPeerSelected: {
-                peer.selectionType = ContentTransfer.Single;
-                picker.activeTransfer = peer.request(appStore);
-            }
-            onCancelPressed: PopupUtils.close(picker)
-        }
-    }
-
-    Connections {
-        target: picker.activeTransfer ? picker.activeTransfer : null
-        onStateChanged: {
-            if (picker.activeTransfer.state === ContentTransfer.Charged) {
-                if (picker.activeTransfer.items.length > 0) {
-                    var fileUrl = picker.activeTransfer.items[0].url;
-                    picker.fileImportSignal(
-                        fileUrl.toString().replace("file://", "")
-                    );
-                    PopupUtils.close(picker);
-                }
-            } else if (picker.activeTransfer.state === ContentTransfer.Aborted){
-                picker.fileImportSignal(false);
-                PopupUtils.close(picker);
-            }
-        }
-    }
-}
 
=== modified file 'plugins/wifi/OtherNetwork.qml'
--- plugins/wifi/OtherNetwork.qml	2016-08-17 11:26:03 +0000
+++ plugins/wifi/OtherNetwork.qml	2016-10-19 07:36:02 +0000
@@ -20,18 +20,25 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItems
 import Ubuntu.Components.Popups 1.3
+import Ubuntu.Settings.Components 0.1
 import Ubuntu.SystemSettings.Wifi 1.0
 
 Component {
 
     Dialog {
 
+        Component {
+            id: filePickerComponent
+            FilePicker {}
+        }
+
         id: otherNetworkDialog
         objectName: "otherNetworkDialog"
         anchorToKeyboard: true
 
         property string ssid
         property string bssid
+        property string keyMgmt
 
         function settingsValid () {
             if (networkname.length === 0) {
@@ -59,11 +66,10 @@
             var pickerDialog;
             var certDialog;
 
-            pickerDialog = PopupUtils.open(
-                Qt.resolvedUrl("./CertPicker.qml")
-            );
-            pickerDialog.fileImportSignal.connect(function (file) {
-                if (!file === false) {
+            pickerDialog = PopupUtils.open(filePickerComponent);
+            pickerDialog.accept.connect(function (file) {
+                PopupUtils.close(pickerDialog);
+                if (file) {
                     certDialogLoader.source = Qt.resolvedUrl(
                         "./CertDialog.qml"
                     );
@@ -84,12 +90,13 @@
                     });
                 }
             });
+            pickerDialog.reject.connect(function () {
+                PopupUtils.close(pickerDialog);
+            });
         }
 
         title: ssid ?
-               /* TODO(jgdx): Hack to avoid breaking string freeze. This will be
-               changed to i18n.tr("Connect to %1").arg(ssid) per spec. */
-               i18n.tr("Connect to Wi‑Fi") + " " + ssid :
+               i18n.tr("Connect to %1").arg(ssid) :
                i18n.tr("Connect to Hidden Network")
         text: feedback.enabled ? feedback.text : "";
 
@@ -322,7 +329,22 @@
                 i18n.tr("Dynamic WEP (802.1x)"), // index: 4
                 i18n.tr("LEAP"),                 // index: 5
             ]
-            selectedIndex: 1
+            selectedIndex: {
+                switch(keyMgmt) {
+                case 'none': // WEP
+                    return 0;
+                case 'wpa-eap': // WPA-Enterprise
+                    return 2;
+                case 'wep': // WEP
+                    return 3;
+                case 'ieee8021x': // Dynamic WEP
+                    return 4;
+                case 'wpa-none': // Ad-Hoc WPA-PSK
+                case 'wpa-psk': // infrastructure WPA-PSK
+                default: // Default is WPA
+                    return 1;
+                }
+            }
         }
 
         Label {
@@ -357,7 +379,6 @@
             visible: securityList.selectedIndex === 2 ||
                      securityList.selectedIndex === 4
         }
-
         Label {
             id: p2authListLabel
             text : i18n.tr("Inner authentication")
@@ -791,7 +812,7 @@
             font.bold: false
             color: Theme.palette.normal.baseText
             elide: Text.ElideRight
-            visible: securityList.selectedIndex !== 0
+            visible: password.visible
         }
 
         TextField {
@@ -799,6 +820,7 @@
             objectName: "password"
             width: parent.width
             visible: securityList.selectedIndex !== 0
+
             echoMode: passwordVisibleSwitch.checked ?
                       TextInput.Normal : TextInput.Password
             inputMethodHints: Qt.ImhNoPredictiveText
@@ -809,7 +831,7 @@
             id: passwordVisiblityRow
             layoutDirection: Qt.LeftToRight
             spacing: units.gu(2)
-            visible: securityList.selectedIndex !== 0
+            visible: password.visible
 
             CheckBox {
                 id: passwordVisibleSwitch
 
=== modified file 'plugins/wifi/certhandler.cpp'
--- plugins/wifi/certhandler.cpp	2015-06-15 19:28:23 +0000
+++ plugins/wifi/certhandler.cpp	2016-10-19 07:36:02 +0000
@@ -32,19 +32,19 @@
     }
 }
 
-QString FileHandler::moveCertFile(QString filename){
+QString FileHandler::copyCertFile(QString filename){
     QDir certPath(CERTS_PATH);
     if (!certPath.exists(CERTS_PATH)){
         certPath.mkpath(CERTS_PATH);
     }
-    QFile file(filename);
     QByteArray certificate = getCertContent(filename);
     QList<QSslCertificate> SslCertificateList = QSslCertificate::fromData(certificate, QSsl::Pem);
     if ( !SslCertificateList.isEmpty() ){
         QStringList subject = SslCertificateList[0].subjectInfo(QSslCertificate::CommonName);
         QString modFileName = CERTS_PATH+subject[0]+".pem";
-        if(file.rename(modFileName.replace(" ", "_"))){
-            return file.fileName();
+        modFileName = modFileName.replace(" ", "_");
+        if(QFile::copy(filename, modFileName)){
+            return modFileName;
         } else {
             return "";
         }
@@ -52,7 +52,7 @@
     return "";
 }
 
-QString FileHandler::moveKeyFile(QString filename){
+QString FileHandler::copyKeyFile(QString filename){
     QDir keyPath(KEYS_PATH);
     if (!keyPath.exists(KEYS_PATH)){
         keyPath.mkpath(KEYS_PATH);
@@ -64,8 +64,8 @@
     if ( !checkKey.isNull() ){
         QFileInfo fileInfo(file);
         QString modFileName = KEYS_PATH + fileInfo.fileName().replace(" ", "_");
-        if(file.rename(modFileName)){
-            return file.fileName();
+        if(QFile::copy(filename, modFileName)){
+            return modFileName;
         } else {
             return "" ;
         }
@@ -73,7 +73,7 @@
     return "";
 }
 
-QString FileHandler::movePacFile(QString filename){
+QString FileHandler::copyPacFile(QString filename){
     QDir keyPath(PACS_PATH);
     if (!keyPath.exists(PACS_PATH)){
         keyPath.mkpath(PACS_PATH);
@@ -81,17 +81,12 @@
     QFile file(filename);
     QFileInfo fileInfo(file);
     QString modFileName = PACS_PATH + fileInfo.baseName().replace(" ", "_") + ".pac";
-    if(file.rename(modFileName)){
-        return file.fileName();
+    if(QFile::copy(filename, modFileName)){
+        return modFileName;
     }
     return "" ;
 }
 
-bool FileHandler::removeFile(QString filename){
-    QFile file(filename);
-    return file.remove();
-}
-
 struct CertificateListModel::Private {
     QStringList data;
 };
@@ -144,8 +139,9 @@
 }
 
 QVariant CertificateListModel::data(const QModelIndex &index, int role) const {
+    QVariant rv;
     if(!index.isValid() || index.row() >= ( p->data.size()) ) {
-        return QVariant();
+        return rv;
     } else if (index.row() == 0){
         const QString &row0 = p->data[index.row()];
 
@@ -168,13 +164,19 @@
     const QString &row = CERTS_PATH+p->data[index.row()];
     QList<QSslCertificate> certificate = QSslCertificate::fromPath(row, QSsl::Pem, QRegExp::Wildcard);
 
+    if (certificate.size() == 0) {
+        return rv;
+    }
+
     switch(role) {
-
-    case CNRole : return certificate[0].subjectInfo(QSslCertificate::CommonName)[0];
-    case ORole : return certificate[0].subjectInfo(QSslCertificate::Organization)[0];
-    case expDateRole : return certificate[0].expiryDate().toString("dd.MM.yyyy");
-
-    default : return QVariant();
+    case CNRole:
+        return certificate[0].subjectInfo(QSslCertificate::CommonName).value(0, "");
+    case ORole:
+        return certificate[0].subjectInfo(QSslCertificate::Organization).value(0, "");
+    case expDateRole:
+        return certificate[0].expiryDate().toString("dd.MM.yyyy");
+    default:
+        return rv;
     }
 }
 
 
=== modified file 'plugins/wifi/certhandler.h'
--- plugins/wifi/certhandler.h	2015-06-03 19:35:09 +0000
+++ plugins/wifi/certhandler.h	2016-10-19 07:36:02 +0000
@@ -11,10 +11,9 @@
     Q_OBJECT
 public:
     Q_INVOKABLE QByteArray getCertContent(QString filename);
-    Q_INVOKABLE QString moveCertFile(QString filename);
-    Q_INVOKABLE QString moveKeyFile(QString filename);
-    Q_INVOKABLE QString movePacFile(QString filename);
-    Q_INVOKABLE bool removeFile(QString filename);
+    Q_INVOKABLE QString copyCertFile(QString filename);
+    Q_INVOKABLE QString copyKeyFile(QString filename);
+    Q_INVOKABLE QString copyPacFile(QString filename);
 };
 
 
 
=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2016-08-19 12:49:41 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2016-10-19 07:36:02 +0000
@@ -1754,38 +1754,6 @@
         self._openvpn_port_field.write(port)
 
     @autopilot.logging.log_action(logger.debug)
-    def set_openvpn_ca(self, paths):
-        self.set_openvpn_file(self._openvpn_ca_field, paths)
-
-    @autopilot.logging.log_action(logger.debug)
-    def set_openvpn_file(self, field, paths):
-        utils.dismiss_osk()
-        self.get_root_instance().main_view.scroll_to_and_click(field)
-
-        # Wait for expanded animation.
-        sleep(0.5)
-
-        # file = field.wait_select_single(objectName='vpnFileSelectorItem0')
-        choose = field.wait_select_single(objectName='vpnFileSelectorItem1')
-        self.pointing_device.click_object(choose)
-        self.get_root_instance().main_view.scroll_to_and_click(choose)
-        file_dialog = self.get_root_instance().wait_select_single(
-            objectName='vpnDialogFile'
-        )
-
-        # Go to root /
-        root = file_dialog.wait_select_single(objectName='vpnFilePathItem_/')
-        self.pointing_device.click_object(root)
-
-        for path in paths:
-            list_view = file_dialog.wait_select_single(
-                'QQuickListView', objectName='vpnFileList'
-            )
-            list_view.click_element('vpnFileItem_%s' % path)
-        accept = file_dialog.wait_select_single(objectName='vpnFileAccept')
-        self.pointing_device.click_object(accept)
-
-    @autopilot.logging.log_action(logger.debug)
     def openvpn_okay(self):
         utils.dismiss_osk()
         self.get_root_instance().main_view.scroll_to_and_click(
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_vpn.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_vpn.py	2016-03-09 14:03:57 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_vpn.py	2016-10-19 07:36:02 +0000
@@ -35,10 +35,6 @@
         page.set_openvpn_server('vpn.ubuntu.com')
         page.set_openvpn_custom_port('1000')
 
-        page.set_openvpn_ca(
-            # Any file will do.
-            ['etc', 'apt', 'sources.list']
-        )
         page.openvpn_okay()
 
         self.assertThat(
@@ -47,11 +43,6 @@
         )
 
         self.assertThat(
-            lambda: conn_obj.Get(VPN_CONN_OPENVPN_IFACE, 'ca'),
-            Eventually(Equals('/etc/apt/sources.list'))
-        )
-
-        self.assertThat(
             lambda: conn_obj.Get(VPN_CONN_OPENVPN_IFACE, 'portSet'),
             Eventually(Equals(True))
         )