Merge lp:~fginther/ubuntu-filemanager-app/copy-Xauthority into lp:ubuntu-filemanager-app

[Francis Ginther]

Copy .Xauthority file before patching HOME in autopilot tests. This allows the tests to run over an ssh session as is done by jenkins.

Copy .Xauthority file before patching HOME in autopilot tests. This allows the tests to run over an ssh session as is done by jenkins.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:60
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/10/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/220
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-precise-amd64-ci/10
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-quantal-amd64-ci/10
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/10
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/10

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/10/rebuild

review: Needs Fixing (continuous-integration)

[lp:~fginther/ubuntu-filemanager-app/copy-Xauthority]

61. By Francis Ginther on 2013-09-04

Add dependency on qtdeclarative5-localstorage-plugin.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:61
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/11/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/222/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-precise-amd64-ci/11
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-quantal-amd64-ci/11
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/11
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/11

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/11/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:61
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/12/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/224
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-precise-amd64-ci/12
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-quantal-amd64-ci/12
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/12
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/12

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/12/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:61
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/13/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/230
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-precise-amd64-ci/13
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-quantal-amd64-ci/13
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/13
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/13

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/13/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

61. By Francis Ginther on 2013-09-04

Add dependency on qtdeclarative5-localstorage-plugin.

60. By Francis Ginther on 2013-09-04

Copy .Xauthority file before patching HOME.

=== modified file 'debian/control'
--- debian/control	2013-08-06 17:08:11 +0000
+++ debian/control	2013-09-04 18:11:21 +0000
@@ -12,6 +12,7 @@
 Architecture: all
 Depends: ${misc:Depends},
          qmlscene,
+         qtdeclarative5-localstorage-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-nemo-qml-plugin-folderlistmodel

=== modified file 'tests/autopilot/ubuntu_filemanager_app/tests/test_filemanager.py'
--- tests/autopilot/ubuntu_filemanager_app/tests/test_filemanager.py	2013-08-15 22:08:28 +0000
+++ tests/autopilot/ubuntu_filemanager_app/tests/test_filemanager.py	2013-09-04 18:11:21 +0000
@@ -42,6 +42,9 @@
 
     def _patch_home(self):
         temp_dir = tempfile.mkdtemp()
+        shutil.copyfile(
+            os.path.expanduser(os.path.join('~', '.Xauthority')),
+            os.path.join(temp_dir, '.Xauthority'))
         self.addCleanup(shutil.rmtree, temp_dir)
         patcher = mock.patch.dict('os.environ', {'HOME': temp_dir})
         patcher.start()