Merge lp:~mardy/ubuntu-system-settings-online-accounts/password-1508935 into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Fixes to the password dialog and tests:
- Correct layout, by setting a height on the button row
- Don't handle the finished() signal more than once
- Fix click hook tests, by using a sincle D-Bus connection for all tests

Fixes to the password dialog and tests:
- Correct layout, by setting a height on the button row
- Don't handle the finished() signal more than once
- Fix click hook tests, by using a sincle D-Bus connection for all tests

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:311
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/264/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/972/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/52/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/52/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/972/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/264/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'online-accounts-ui/dialog-request.cpp'
--- online-accounts-ui/dialog-request.cpp	2014-10-10 11:45:03 +0000
+++ online-accounts-ui/dialog-request.cpp	2015-11-06 08:12:55 +0000
@@ -236,6 +236,8 @@
     Q_Q(DialogRequest);
 
     DEBUG() << "Dialog closed";
+    QObject::disconnect(m_dialog, SIGNAL(finished(int)),
+                        this, SLOT(onFinished()));
 
     QVariantMap reply;
 

=== modified file 'online-accounts-ui/qml/SignOnUiDialog.qml'
--- online-accounts-ui/qml/SignOnUiDialog.qml	2015-10-22 08:28:26 +0000
+++ online-accounts-ui/qml/SignOnUiDialog.qml	2015-11-06 08:12:55 +0000
@@ -83,6 +83,7 @@
         Item {
             anchors.left: parent.left
             anchors.right: parent.right
+            height: childrenRect.height
 
             Button {
                 objectName: "cancelButton"

=== modified file 'tests/click-hooks/tst_online_accounts_hooks2.cpp'
--- tests/click-hooks/tst_online_accounts_hooks2.cpp	2015-09-28 14:35:19 +0000
+++ tests/click-hooks/tst_online_accounts_hooks2.cpp	2015-11-06 08:12:55 +0000
@@ -88,6 +88,10 @@
     QStringList findGeneratedFiles() const;
 
 private:
+    QtDBusTest::DBusTestRunner m_dbus;
+    QtDBusMock::DBusMock m_mock;
+    FakeSignond m_signond;
+    QByteArray m_busAddress;
     QDir m_testDir;
     QDir m_hooksDir;
     QDir m_installDir;
@@ -96,11 +100,15 @@
 
 OnlineAccountsHooksTest::OnlineAccountsHooksTest():
     QObject(0),
+    m_dbus(),
+    m_mock(m_dbus),
+    m_signond(&m_mock),
     m_testDir(TEST_DIR),
     m_hooksDir(TEST_DIR "/online-accounts-hooks2"),
     m_installDir(TEST_DIR "/accounts"),
     m_packageDir(TEST_DIR "/package")
 {
+    m_busAddress = qgetenv("DBUS_SESSION_BUS_ADDRESS");
 }
 
 void OnlineAccountsHooksTest::clearHooksDir()
@@ -710,11 +718,8 @@
 
 void OnlineAccountsHooksTest::testRemovalWithAcl()
 {
-    QtDBusTest::DBusTestRunner dbus;
-    QtDBusMock::DBusMock mock(dbus);
-    FakeSignond signond(&mock);
-
-    dbus.startServices();
+    qputenv("DBUS_SESSION_BUS_ADDRESS", m_busAddress);
+    m_dbus.startServices();
 
     QString myApp("applications/com.ubuntu.test_MyAcl.application");
     writeInstalledFile(myApp,
@@ -764,7 +769,7 @@
     initialAcl << "one" << "com-ubuntu.test_MyAcl_0.1" << "two_click";
     initialInfo["ACL"] = initialAcl;
     initialInfo["Id"] = 25;
-    signond.addIdentity(25, initialInfo);
+    m_signond.addIdentity(25, initialInfo);
 
     /* Now run the hook process; it should delete the .service and .application
      * files, and also disable the service and remove the app from the ACL */
@@ -808,6 +813,6 @@
     QVERIFY(!m_hooksDir.exists(staleTimestamp2));
 }
 
-QTEST_MAIN(OnlineAccountsHooksTest);
+QTEST_GUILESS_MAIN(OnlineAccountsHooksTest);
 
 #include "tst_online_accounts_hooks2.moc"