ubuntu-touch-coreapps-reviewers team mailing list archive

[Nicholas Skaggs <nskaggs@xxxxxxxxxx>]

Nicholas Skaggs has proposed merging lp:~nskaggs/ubuntu-filemanager-app/fix-xauthority into lp:ubuntu-filemanager-app with lp:~nskaggs/ubuntu-filemanager-app/add-dep-cache as a prerequisite.

Commit message:
Remove unneeded _copy_xauthority_file

Requested reviews:
  Ubuntu File Manager Developers (ubuntu-filemanager-dev)
Related bugs:
  Bug #1220607 in Ubuntu File Manager App: "Autopilot tests fail due to XAuthority bug"
  https://bugs.launchpad.net/ubuntu-filemanager-app/+bug/1220607

For more details, see:
https://code.launchpad.net/~nskaggs/ubuntu-filemanager-app/fix-xauthority/+merge/288838

Remove unneeded _copy_xauthority_file
-- 
Your team Ubuntu File Manager Developers is requested to review the proposed merge of lp:~nskaggs/ubuntu-filemanager-app/fix-xauthority into lp:ubuntu-filemanager-app.

=== modified file 'tests/autopilot/filemanager/tests/__init__.py'
--- tests/autopilot/filemanager/tests/__init__.py	2016-03-07 15:15:45 +0000
+++ tests/autopilot/filemanager/tests/__init__.py	2016-03-11 21:17:45 +0000
@@ -157,23 +157,6 @@
         directory = registry.get_path(package_name)
         return version, directory
 
-    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
         """
@@ -188,7 +171,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))