Merge lp:~unity-team/qtmir/1541388.close-resumable into lp:qtmir

[Michał Sawicz]

Added fix and test for closing app during the StoppedResumable state.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:439
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/57/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/57/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:442
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/58/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/58/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes

 * Did CI run pass? If not, please explain why.

waiting. But tests are passing here.

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:442
http://jenkins.qa.ubuntu.com/job/qtmir-ci/680/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/374
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/376
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/376/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/256
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/411/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/413/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/256/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/680/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:444
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/59/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/59/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:444
http://jenkins.qa.ubuntu.com/job/qtmir-ci/681/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/375
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/377
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/377/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/257
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/412/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/414/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/257/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/681/rebuild

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

This fix landed in rev 439 already.

Unmerged revisions

444. By Michał Sawicz on 2016-02-03

Adapt to new TaskController

443. By Michał Sawicz on 2016-02-03

Merge lp:~dandrader/qtmir/removeUselessClass

=== modified file 'src/modules/Unity/Application/application.cpp'
--- src/modules/Unity/Application/application.cpp	2016-02-03 20:25:27 +0000
+++ src/modules/Unity/Application/application.cpp	2016-02-03 20:25:27 +0000
@@ -428,6 +428,9 @@
         // already on the way
         break;
     case InternalState::StoppedResumable:
+        // session stopped while suspended. Stop it for good now.
+        setInternalState(InternalState::Stopped);
+        break;
     case InternalState::Stopped:
         // too late
         break;

=== modified file 'tests/modules/ApplicationManager/application_manager_test.cpp'
--- tests/modules/ApplicationManager/application_manager_test.cpp	2016-02-03 20:25:27 +0000
+++ tests/modules/ApplicationManager/application_manager_test.cpp	2016-02-03 20:25:27 +0000
@@ -2266,3 +2266,38 @@
     EXPECT_EQ(Application::Stopped, application->state());
     EXPECT_EQ(spy.count(), 1);
 }
+
+/*
+ * Test that an application that fails while suspended will stop on close request
+ */
+TEST_F(ApplicationManagerTests,CloseWhenSuspendedProcessFailed)
+{
+    using namespace ::testing;
+
+    const QString appId("testAppId");
+    quint64 procId = 5551;
+
+    auto application = startApplication(procId, "testAppId");
+
+    qtmir::Session* session(static_cast<qtmir::Session*>(application->session()));
+
+    FakeMirSurface *surface = new FakeMirSurface;
+    onSessionCreatedSurface(session->session().get(), surface);
+    surface->drawFirstFrame();
+    EXPECT_EQ(Application::InternalState::Running, application->internalState());
+
+    // Session is suspended
+    suspend(application);
+
+    // Process failed
+    onSessionStopping(session->session());
+    applicationManager.onProcessFailed(appId, TaskController::Error::APPLICATION_CRASHED);
+    applicationManager.onProcessStopped(appId);
+    EXPECT_EQ(Application::InternalState::StoppedResumable, application->internalState());
+
+    QSignalSpy spy(application, SIGNAL(stopped()));
+    application->close();
+
+    EXPECT_EQ(Application::Stopped, application->state());
+    EXPECT_EQ(spy.count(), 1);
+}