Merge lp:~nskaggs/ubuntu-calendar-app/remove-xauthority into lp:ubuntu-calendar-app

[Nicholas Skaggs]

Remove unneeded _copy_xauthority_file

Remove unneeded _copy_xauthority_file

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:769
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/795/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/797/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/795/rebuild

review: Approve (continuous-integration)

Unmerged revisions

769. By Nicholas Skaggs on 2016-03-11

remove _copy_xauthority_file

=== modified file 'tests/autopilot/calendar_app/tests/__init__.py'
--- tests/autopilot/calendar_app/tests/__init__.py	2014-11-07 20:53:29 +0000
+++ tests/autopilot/calendar_app/tests/__init__.py	2016-03-11 21:16:47 +0000
@@ -83,23 +83,6 @@
             "com.ubuntu.calendar",
             emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 
-    def _copy_xauthority_file(self, directory):
-        """ Copy .Xauthority file to directory, if it exists in /home
-        """
-        # If running under xvfb, as jenkins does,
-        # xsession will fail to start without xauthority file
-        # Thus if the Xauthority file is in the home directory
-        # make sure we copy it to our temp home directory
-
-        xauth = os.path.expanduser(os.path.join(os.environ.get('HOME'),
-                                   '.Xauthority'))
-        if os.path.isfile(xauth):
-            logger.debug("Copying .Xauthority to %s" % directory)
-            shutil.copyfile(
-                os.path.expanduser(os.path.join(os.environ.get('HOME'),
-                                   '.Xauthority')),
-                os.path.join(directory, '.Xauthority'))
-
     def patch_home(self):
         """ mock /home for testing purposes to preserve user data
         """
@@ -117,7 +100,6 @@
             temp_dir = temp_dir_fixture.path
 
             # before we set fixture, copy xauthority if needed
-            self._copy_xauthority_file(temp_dir)
             self.useFixture(fixtures.EnvironmentVariable('HOME',
                                                          newvalue=temp_dir))