Merge lp:~dobey/ubuntuone-client/fix-home-patch into lp:ubuntuone-client

[dobey]

Move the patching of user_home to before where it is used elsewhere in setUp

[Brian Curtin (brian.curtin)]

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'contrib/testing/testcase.py'
--- contrib/testing/testcase.py	2012-08-13 14:34:36 +0000
+++ contrib/testing/testcase.py	2012-08-16 17:44:22 +0000
@@ -391,6 +391,11 @@
     def setUp(self):
         yield super(BaseTwistedTestCase, self).setUp()
         self.__root = None
+
+        # Patch the user home
+        self.home_dir = self.mktemp('ubuntuonehacker')
+        self.patch(platform, "user_home", self.home_dir)
+
         # use the config from the branch
         new_get_config_files = lambda: [os.path.join(os.environ['ROOTDIR'],
                                                    'data', 'syncdaemon.conf')]
@@ -411,9 +416,6 @@
         self.log = logging.getLogger("ubuntuone.SyncDaemon.TEST")
         self.log.info("starting test %s.%s", self.__class__.__name__,
                       self._testMethodName)
-        # Patch the user home
-        self.home_dir = self.mktemp('ubuntuonehacker')
-        self.patch(platform, "user_home", self.home_dir)
         self.patch(action_queue.tunnel_runner, "TunnelRunner",
                    self.tunnel_runner_class)