Unity 8

Merge lp:~saviq/unity8/fix-mir-autopilot into lp:unity8

fix-mir-autopilot
Merge into trunk

Proposed by Michał Sawicz on 2013-10-04

Status:

Merged

Approved by:

Francis Ginther on 2013-10-05

Approved revision:

396

Merged at revision:

397

Proposed branch:

lp:~saviq/unity8/fix-mir-autopilot

Merge into:

lp:unity8

Diff against target:

54 lines (+16/-7)

2 files modified

main.cpp (+3/-3)
tests/autopilot/unity8/shell/tests/__init__.py (+13/-4)

To merge this branch:

bzr merge lp:~saviq/unity8/fix-mir-autopilot

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-10-05
Gerry Boland (community)		2013-10-04	Approve on 2013-10-04
Review via email: mp+189350@code.launchpad.net

Commit message

Respect pre-set import and library paths and prevent segfault in startShell.

Revision history for this message

Gerry Boland (gerboland) wrote on 2013-10-04:

Fixes AP!

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-04:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1260/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-04:

review: Needs Fixing (continuous-integration)

Revision history for this message

Francis Ginther (fginther) wrote on 2013-10-04:

A necessary job change caused the mako failure, re-approving.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-05:

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-05:

review: Needs Fixing (continuous-integration)

Revision history for this message

Francis Ginther (fginther) wrote on 2013-10-05:

The autopilot testing (all three jobs) ran into a package version conflict. A 'newer' version of qtdeclarative5-unity-notifications-plugin showed up in the ubuntu archive, but it was apparently older source and didn't contain the version bump to unity-notifications-impl-2. The version in the local archive (10.97.0.6) did, but wasn't the candidate version and therefore couldn't be installed through dependency resolution from unity8:

# apt-cache policy qtdeclarative5-unity-notifications-plugin
qtdeclarative5-unity-notifications-plugin:
  Installed: (none)
  Candidate: 0.1.1+13.10.20131004.2-0ubuntu1
  Version table:
     0.1.1+13.10.20131004.2-0ubuntu1 0
        500 http://archive.ubuntu.com/ubuntu/ saucy/universe amd64 Packages
     0.1.1bzr177pkg0saucy0 0
        500 http://10.97.0.6/archive//head.unity8/ saucy/ Packages

I believe this is fixed by an internal rebuild of unity-notifications to pick up the changelog version bump that was done. After the rebuild and apt-get update this should now work:

# apt-cache policy qtdeclarative5-unity-notifications-plugin
qtdeclarative5-unity-notifications-plugin:
  Installed: (none)
  Candidate: 0.1.1+13.10.20131005bzr177pkg0saucy9
  Version table:
     0.1.1+13.10.20131005bzr177pkg0saucy9 0
        500 http://10.97.0.6/archive//head.unity8/ saucy/ Packages
     0.1.1+13.10.20131004.2-0ubuntu1 0
        500 http://archive.ubuntu.com/ubuntu/ saucy/universe amd64 Packages

The MP was re-approved to re-run all the testing.

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2013-10-05:

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Michał Sawicz

Mohammad Rakibul Hasan

Unity Team

 === modified file 'main.cpp'
 --- main.cpp	2013-09-27 14:09:23 +0000
 +++ main.cpp	2013-10-04 16:03:42 +0000
@@ -160,10 +160,10 @@
      prependImportPaths(view->engine(), ::overrideImportPaths());
      appendImportPaths(view->engine(), ::fallbackImportPaths());
--    QStringList importPath = view->engine()->importPathList().filter("qt5/imports");
      if (isUbuntuMirServer) {
--        importPath.first().append("/Unity-Mir");
--        view->engine()->addImportPath(importPath.first());
++        QStringList importPaths = view->engine()->importPathList();
++        importPaths.replaceInStrings(QRegExp("qt5/imports$"), "qt5/imports/Unity-Mir");
++        view->engine()->setImportPathList(importPaths);
+     }
      view->setSource(source);
 === modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
 --- tests/autopilot/unity8/shell/tests/__init__.py	2013-10-03 21:26:52 +0000
 +++ tests/autopilot/unity8/shell/tests/__init__.py	2013-10-04 16:03:42 +0000
@@ -183,10 +183,14 @@
      def patch_lightdm_mock(self, mock_type='single'):
          self._lightdm_mock_type = mock_type
          logger.info("Setting up LightDM mock type '%s'", mock_type)
--        new_ld_library_path = "%s:%s" % (
++        new_ld_library_path = [
              get_default_extra_mock_libraries(),
              self._get_lightdm_mock_path(mock_type)
--        )
++        ]
++        if os.getenv('LD_LIBRARY_PATH') is not None:
++            new_ld_library_path.append(os.getenv('LD_LIBRARY_PATH'))
++
++        new_ld_library_path = ':'.join(new_ld_library_path)
          logger.info("New library path: %s", new_ld_library_path)
          self.patch_environment('LD_LIBRARY_PATH', new_ld_library_path)
@@ -205,8 +209,13 @@
          return lightdm_mock_path
      def _setup_extra_mock_environment_patch(self):
--        mocks_library_path = get_mocks_library_path()
--        self.patch_environment('QML2_IMPORT_PATH', mocks_library_path)
++        qml_import_path = [get_mocks_library_path()]
++        if os.getenv('QML2_IMPORT_PATH') is not None:
++            qml_import_path.append(os.getenv('QML2_IMPORT_PATH'))
++
++        qml_import_path = ':'.join(qml_import_path)
++        logger.info("New QML2 import path: %s", qml_import_path)
++        self.patch_environment('QML2_IMPORT_PATH', qml_import_path)
      def _set_proxy(self, proxy):
          """Keep a copy of the proxy object, so we can use it to get common

Unity 8

Merge lp:~saviq/unity8/fix-mir-autopilot into lp:unity8

Commit message

Description of the change

Preview Diff

Subscribers