Consolidated setting of st_ino

- now is always set in add_entry
- st_ino was not set in fake_filesystem.makedir,
  what caused incorrect behavior for os.samefile for directories
- fixes #515

Author: mrbean-bremen

CHANGES.md

@@ -20,6 +20,7 @@ the proposed changes so you can be ready.
     functions
 
 #### Fixes
+  * Added missing `st_ino` in `makedir` (see [#515](../../issues/515))
   * Fixed handling of relative paths in `lresolve` / `os.lstat`
     (see [#516](../../issues/516))
   * Fixed handling of byte string paths 

pyfakefs/fake_filesystem.py

@@ -646,6 +646,9 @@ def add_entry(self, path_object):
 
         self.contents[path_object_name] = path_object
         path_object.parent_dir = self
+        if path_object.st_ino is None:
+            self.filesystem.last_ino += 1
+            path_object.st_ino = self.filesystem.last_ino
         self.st_nlink += 1
         path_object.st_nlink += 1
         path_object.st_dev = self.st_dev
@@ -878,8 +881,8 @@ def __init__(self, path_separator=os.path.sep, total_size=None,
         # A heap containing all free positions in self.open_files list
         self._free_fd_heap = []
         # last used numbers for inodes (st_ino) and devices (st_dev)
-        self._last_ino = 0
-        self._last_dev = 0
+        self.last_ino = 0
+        self.last_dev = 0
         self.mount_points = {}
         self.add_mount_point(self.root.name, total_size)
         self._add_standard_streams()
@@ -896,8 +899,8 @@ def reset(self, total_size=None):
 
         self.open_files = []
         self._free_fd_heap = []
-        self._last_ino = 0
-        self._last_dev = 0
+        self.last_ino = 0
+        self.last_dev = 0
         self.mount_points = {}
         self.add_mount_point(self.root.name, total_size)
         self._add_standard_streams()
@@ -994,14 +997,18 @@ def add_mount_point(self, path, total_size=None):
         path = self.absnormpath(path)
         if path in self.mount_points:
             self.raise_os_error(errno.EEXIST, path)
-        self._last_dev += 1
+        self.last_dev += 1
         self.mount_points[path] = {
-            'idev': self._last_dev, 'total_size': total_size, 'used_size': 0
+            'idev': self.last_dev, 'total_size': total_size, 'used_size': 0
         }
         # special handling for root path: has been created before
-        root_dir = (self.root if path == self.root.name
-                    else self.create_dir(path))
-        root_dir.st_dev = self._last_dev
+        if path == self.root.name:
+            root_dir = self.root
+            self.last_ino += 1
+            root_dir.st_ino = self.last_ino
+        else:
+            root_dir = self.create_dir(path)
+        root_dir.st_dev = self.last_dev
         return self.mount_points[path]
 
     def _auto_mount_drive_if_needed(self, path, force=False):
@@ -2293,8 +2300,6 @@ def create_dir(self, directory_path, perm_bits=PERM_DEF):
         for new_dir in new_dirs:
             new_dir.st_mode = S_IFDIR | perm_bits
 
-        self._last_ino += 1
-        current_dir.st_ino = self._last_ino
         return current_dir
 
     def create_file(self, file_path, st_mode=S_IFREG | PERM_DEF_FILE,
@@ -2448,8 +2453,6 @@ def add_real_directory(self, source_path, read_only=True, lazy_read=True,
             new_dir = FakeDirectoryFromRealDirectory(
                 source_path, self, read_only, target_path)
             parent_dir.add_entry(new_dir)
-            self._last_ino += 1
-            new_dir.st_ino = self._last_ino
         else:
             new_dir = self.create_dir(target_path)
             for base, _, files in os.walk(source_path):
@@ -2557,8 +2560,6 @@ def create_file_internally(self, file_path,
                                    encoding=encoding, errors=errors,
                                    side_effect=side_effect)
 
-        self._last_ino += 1
-        file_object.st_ino = self._last_ino
         self.add_object(parent_directory, file_object)
 
         if st_size is None and contents is None:

pyfakefs/tests/fake_filesystem_shutil_test.py

@@ -20,6 +20,7 @@
 import os
 import shutil
 import sys
+import tempfile
 import unittest
 
 from pyfakefs import fake_filesystem_unittest
@@ -489,6 +490,17 @@ def test_raises_if_dest_is_a_directory(self):
         else:
             self.assertRaises(OSError, shutil.copyfile, src_file, dst_dir)
 
+    def test_moving_dir_into_dir(self):
+        # regression test for #515
+        source_dir = tempfile.mkdtemp()
+        target_dir = tempfile.mkdtemp()
+        filename = 'foo.pdf'
+        with open(os.path.join(source_dir, filename), 'wb') as fp:
+            fp.write(b'stub')
+
+        shutil.move(source_dir, target_dir)
+        shutil.rmtree(target_dir)
+
 
 class RealCopyFileTest(FakeCopyFileTest):
     def use_real_fs(self):