Merge pull request #1685 from davidmarin/symlink-fallback

fall back to copying when os.symlink() fails

mrjob/sim.py

@@ -732,10 +732,14 @@ def _symlink_or_copy(path, dest):
     """
     if hasattr(os, 'symlink'):
         log.debug('creating symlink %s <- %s' % (path, dest))
-        os.symlink(relpath(path, dirname(dest)), dest)
+        try:
+            os.symlink(relpath(path, dirname(dest)), dest)
+            return
+        except OSError as ex:
+            log.debug('  %s' % ex)
+
+    log.debug('copying %s -> %s' % (dest, path))
+    if isdir(path):
+        copytree(path, dest)
     else:
-        log.debug('copying %s -> %s' % (dest, path))
-        if isdir(path):
-            copytree(path, dest)
-        else:
-            copy2(path, dest)
+        copy2(path, dest)

tests/test_local.py

@@ -303,24 +303,27 @@ def test_gz_split_regression(self):
 
 
 class LocalMRJobRunnerNoSymlinksTestCase(LocalMRJobRunnerEndToEndTestCase):
-    """Test systems without os.symlink (e.g. Windows). See Issue #46"""
+    """Test systems without os.symlink() (e.g. Python 2 on Windows).
+    See Issue #46"""
 
     def setUp(self):
         super(LocalMRJobRunnerNoSymlinksTestCase, self).setUp()
-        self.remove_os_symlink()
-
-    def tearDown(self):
-        self.restore_os_symlink()
-        super(LocalMRJobRunnerNoSymlinksTestCase, self).tearDown()
-
-    def remove_os_symlink(self):
         if hasattr(os, 'symlink'):
             self._real_os_symlink = os.symlink
-            del os.symlink  # sorry, were you using that? :)
+            del os.symlink
 
-    def restore_os_symlink(self):
+    def tearDown(self):
         if hasattr(self, '_real_os_symlink'):
             os.symlink = self._real_os_symlink
+        super(LocalMRJobRunnerNoSymlinksTestCase, self).tearDown()
+
+
+class LocalMRJobRunnerBadOSSymlinkTestCase(LocalMRJobRunnerEndToEndTestCase):
+    """Test systems with unfriendly os.symlink() (e.g. Python 3 on Windows).
+    See Issue #1649."""
+    def setUp(self):
+        super(LocalMRJobRunnerEndToEndTestCase, self).setUp()
+        self.start(patch('os.symlink', side_effect=OSError))
 
 
 class TimeoutException(Exception):