Extend functionality of MockFileSystem.move()

Tools/Scripts/webkitpy/common/system/filesystem_mock.py

Index: Tools/Scripts/webkitpy/common/system/filesystem_mock.py
diff --git a/Tools/Scripts/webkitpy/common/system/filesystem_mock.py b/Tools/Scripts/webkitpy/common/system/filesystem_mock.py
index 70dfff3fa64287e63b077decfda3cf5b49f3d7ee..a979521cd676abf46e2e0fa35f112d1afec050e2 100644
--- a/Tools/Scripts/webkitpy/common/system/filesystem_mock.py
+++ b/Tools/Scripts/webkitpy/common/system/filesystem_mock.py
@@ -268,12 +268,17 @@ class MockFileSystem(object):
             norm_path = self.dirname(norm_path)
 
     def move(self, source, destination):
-        if self.files[source] is None:
+        if not self.exists(source):
             self._raise_not_found(source)
-        self.files[destination] = self.files[source]
-        self.written_files[destination] = self.files[destination]
-        self.files[source] = None
-        self.written_files[source] = None
+        source_is_file = self.isfile(source)
+        if source_is_file:

[Dirk Pranke, 2014/08/27 23:46:51]

nit: I don't see an advantage to the local variable here, so I'd just make this
'if self.isfile(source)'

[patro, 2014/09/01 09:28:25]

Done.

+            self.files[destination] = self.files[source]
+            self.written_files[destination] = self.files[destination]
+            self.files[source] = None
+            self.written_files[source] = None

[Dirk Pranke, 2014/08/27 23:46:51]

nit: it would probably be slightly more idiomatic webkitpy-style to early exit
after line 278, remove the 'else:', and dedent the copytree case.

[patro, 2014/09/01 09:28:25]

Done.

+        else:
+            self.copytree(source, destination)
+            self.rmtree(source)
 
     def _slow_but_correct_normpath(self, path):
         return re.sub(re.escape(os.path.sep), self.sep, os.path.normpath(path))