multipass-test:couple-container-matchers

Last commit made on 2021-08-26
Get this branch:
git clone -b couple-container-matchers https://git.launchpad.net/multipass-test

Branch merges

Branch information

Name:
couple-container-matchers
Repository:
lp:multipass-test

Recent commits

a08543e... by Ricardo Abreu

[test] Fix message negation in custom matcher

2a49cc8... by Ricardo Abreu

Revert "[test] Dropped unused matchers"

This reverts commit 0cd34a6f06b875fb2abe52539324f78019e50379.

e163103... by "bors[bot]" <26634292+bors[bot]@users.noreply.github.com>

Merge #2215

2215: [test] Dropped unused matchers r=townsend2010 a=ricab

These ended up unused (after changes requested in review). They are in history, so we can always get them back if we need them.

Co-authored-by: Ricardo Abreu <email address hidden>

0cd34a6... by Ricardo Abreu

[test] Dropped unused matchers

345d81c... by "bors[bot]" <26634292+bors[bot]@users.noreply.github.com>

Merge #2207

2207: [SFTP Server] downgrading log message severity. r=townsend2010 a=surahman

**_Issue #2203:_**

I have downgraded the severity of the log messages to `trace` for any message which is also forwarded to the `sftp_client`.

The following log messages have been left as-is because they do not forward a message to the `Client` and I believe, given the severity of the issues, that their log levels are justified:

https://github.com/canonical/multipass/blob/69aeaebc1ace1506c5e88e4fa0a86cab1907c79b/src/sshfs_mount/sftp_server.cpp#L401

https://github.com/canonical/multipass/blob/69aeaebc1ace1506c5e88e4fa0a86cab1907c79b/src/sshfs_mount/sftp_server.cpp#L429-L430

https://github.com/canonical/multipass/blob/69aeaebc1ace1506c5e88e4fa0a86cab1907c79b/src/sshfs_mount/sftp_server.cpp#L581

Co-authored-by: Saad Ur Rahman <email address hidden>

0e9ba05... by "bors[bot]" <26634292+bors[bot]@users.noreply.github.com>

Merge #2193

2193: [gui] Update available multiple msgs bugfix r=ricab a=surahman

**_Issue #2188:_**
Introducing a check for signal connection to the GUI when an update is available.

We could also, potentially, do the following and move the `disconnect` from the `else` statement out to before the update check - which is what you suggested. It is the same code as the original, but just refactored:
```c++
void cmd::GuiCmd::update_about_menu()
{
    auto reply = version_future.result();

    about_client_version.setText("multipass version: " + QString::fromStdString(multipass::version_string));
    about_daemon_version.setText("multipassd version: " + QString::fromStdString(reply.version()));

    QObject::disconnect(&tray_icon, &QSystemTrayIcon::messageClicked, 0, 0);
    tray_icon_menu.removeAction(&update_action);

    if (update_available(reply.update_info()))
    {
        update_action.setIcon(QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation));
        update_action.setWhatsThis(QString::fromStdString(reply.update_info().url()));

        QObject::connect(&tray_icon, &QSystemTrayIcon::messageClicked,
                         [this] { QDesktopServices::openUrl(QUrl(update_action.whatsThis())); });

        tray_icon_menu.insertAction(about_menu.menuAction(), &update_action);
        tray_icon.showMessage(QString::fromStdString(reply.update_info().title()),
                              QString("%1\n\nClick here for more information.")
                                  .arg(QString::fromStdString(reply.update_info().description())));
    }
}
```

My rationale for performing the check to see if there is a connected signal is because it might be more efficient than a potentially needless attempt to disconnect. I am open to suggestions and the above code is sitting on the `dev` branch waiting to be merged if required.

Co-authored-by: Saad Ur Rahman <email address hidden>

e9d4400... by Saad Ur Rahman

[gui] lint fix.

3b16193... by Saad Ur Rahman

Merge branch 'gui-update-multiple-msgs-bugfix-dev' into gui-update-multiple-msgs-bugfix

2978228... by Saad Ur Rahman

[gui] refactored code to fix multiple updates message bug.

7679631... by Saad Ur Rahman

Merge branch 'sftp-server-log-msgs-dev' into sftp-server-log-msgs