Changeset 750:e25458e9bfb1 in hatta-dev

Timestamp:

01/25/10 15:16:53 (2 years ago)

Author:

sheep@…

Branch:

default

Message:

catch another corner case of subdriectory repo

Files:

• hatta.py (modified) (1 diff)
• tests/test_repo.py (modified) (2 diffs)

hatta.py

@@ -706 +706 @@
         try:
             os.makedirs(dir_path)
-        except OSError:
-            pass
+        except OSError, e:
+            if e.errno != 17 or not os.path.isdir(dir_path):
+                raise werkzeug.exceptions.Forbidden(
+                    _(u"Can't make subpages of existing pages"))
         super(WikiSubdirectoryStorage, self).save_file(title, file_name,
                                                        author, comment, parent)

tests/test_repo.py

@@ -116 +116 @@
         assert not exists
 
+    def test_create_parent(self, subdir_repo):
+        """
+        Make sure you can't create a parent page of existsing page.
+        """
+
+        subdir_repo.save_text(u'xxx/yyy', self.text, self.author, self.comment,
+                              parent=-1)
+        py.test.raises(werkzeug.exceptions.Forbidden, subdir_repo.save_text,
+                       u'xxx', self.text, self.author, self.comment,
+                       parent=-1)
+
+    def test_create_subpage(self, subdir_repo):
+        """
+        Make sure you can't create a subpage of existsing page.
+        """
+
+        subdir_repo.save_text(u'xxx', self.text, self.author, self.comment,
+                              parent=-1)
+        py.test.raises(werkzeug.exceptions.Forbidden, subdir_repo.save_text,
+                       u'xxx/yyy', self.text, self.author, self.comment,
+                       parent=-1)
 
 class TestMercurialStorage(object):
@@ -226 +247 @@
         py.test.raises(werkzeug.exceptions.Forbidden, repo.delete_page,
                        self.title, self.author, self.comment)
+
 
 class TestStorage(object):