diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2016-04-22 09:43:44 -0500 |
---|---|---|
committer | Charles Kerr <charles.kerr@canonical.com> | 2016-04-22 09:43:44 -0500 |
commit | ce5234162fa0c534ff9abf3fce3d03f4b01e893e (patch) | |
tree | fa1de28390d3fad05b9a9405190f82cde3fa70e5 /tests/integration | |
parent | b37db33c628675971f118fb3e241dc32a9f0a5d0 (diff) | |
download | ayatana-indicator-display-ce5234162fa0c534ff9abf3fce3d03f4b01e893e.tar.gz ayatana-indicator-display-ce5234162fa0c534ff9abf3fce3d03f4b01e893e.tar.bz2 ayatana-indicator-display-ce5234162fa0c534ff9abf3fce3d03f4b01e893e.zip |
don't prompt when the greeter's not running yet: change greeter's payload from an 'is_active' bool to a three-value state of active, inactive, and unavailable
Diffstat (limited to 'tests/integration')
-rw-r--r-- | tests/integration/usb-manager-test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/integration/usb-manager-test.cpp b/tests/integration/usb-manager-test.cpp index d62756f..7320640 100644 --- a/tests/integration/usb-manager-test.cpp +++ b/tests/integration/usb-manager-test.cpp @@ -206,7 +206,7 @@ TEST_F(UsbManagerFixture, Greeter) auto adbd_server = std::make_shared<GAdbdServer>(*socket_path, std::vector<std::string>{"PK"+public_key}); // set up a UsbManager to process the request - m_greeter->m_is_active.set(true); + m_greeter->m_state.set(Greeter::State::ACTIVE); auto usb_manager = std::make_shared<UsbManager>(*socket_path, *public_keys_path, m_usb_monitor, m_greeter); // add a signal spy to listen to the notification daemon @@ -219,7 +219,7 @@ TEST_F(UsbManagerFixture, Greeter) EXPECT_FALSE(notificationsSpy.wait(2000)); // disable the greeter, the notification should appear - m_greeter->m_is_active.set(false); + m_greeter->m_state.set(Greeter::State::INACTIVE); wait_for_signals(notificationsSpy, 1); EXPECT_EQ("Notify", notificationsSpy.at(0).at(0)); notificationsSpy.clear(); |