Normalize file path in RemoveObject()

CHANGES.md

@@ -11,6 +11,7 @@ The release versions are PyPi releases.
   * Added the CHANGES.md release notes to the release manifest
 
 #### Fixes
+ * `FakeShutilModule.rmtree` failed for directory ending with path separator (#177)
  * Case incorrectly handled for added Windows drives 
  * `pathlib.glob()` incorrectly handled case under MacOS (#167)
  * tox support was broken (#163)

fake_filesystem_shutil_test.py

@@ -45,6 +45,16 @@ def testRmtree(self):
         self.assertFalse(self.filesystem.Exists('%s/subdir' % directory))
         self.assertFalse(self.filesystem.Exists('%s/subfile' % directory))
 
+    def testRmtreeWithTrailingSlash(self):
+        directory = 'xyzzy'
+        self.filesystem.CreateDirectory(directory)
+        self.filesystem.CreateDirectory('%s/subdir' % directory)
+        self.filesystem.CreateFile('%s/subfile' % directory)
+        self.shutil.rmtree(directory + '/')
+        self.assertFalse(self.filesystem.Exists(directory))
+        self.assertFalse(self.filesystem.Exists('%s/subdir' % directory))
+        self.assertFalse(self.filesystem.Exists('%s/subfile' % directory))
+
     def testRmtreeWithoutPermissionForAFile(self):
         self.filesystem.CreateFile('/foo/bar')
         self.filesystem.CreateFile('/foo/baz', st_mode=stat.S_IFREG | 0o444)

pyfakefs/fake_filesystem.py

@@ -1537,7 +1537,7 @@ def RemoveObject(self, file_path):
             of the path refers to something other than a directory.
           OSError: if the directory is in use (eg, if it is '/').
         """
-        file_path = self.NormalizeCase(file_path)
+        file_path = self.NormalizePath(self.NormalizeCase(file_path))
         if self._IsRootPath(file_path):
             raise OSError(errno.EBUSY, 'Fake device or resource busy',
                           file_path)