Rev 5045: Keep only the relevant tests. in file:///home/vila/src/bzr/reviews/138600/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/reviews/138600/

------------------------------------------------------------
revno: 5045
revision-id: v.ladeuil+lp at free.fr-20100302154951-svh2e2093u067udy
parent: parth.malwankar at gmail.com-20100226050933-b8ulaj65imqznwve
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 138600
timestamp: Tue 2010-03-02 16:49:51 +0100
message:
  Keep only the relevant tests.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_versioning.py'
--- a/bzrlib/tests/blackbox/test_versioning.py	2010-02-26 05:09:33 +0000
+++ b/bzrlib/tests/blackbox/test_versioning.py	2010-03-02 15:49:51 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005 Canonical Ltd
+# Copyright (C) 2005, 2006, 2007, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,50 +31,15 @@
 
 class TestMkdir(TestCaseWithTransport):
 
-    def test_mkdir_in_repo(self):
-        """'mkdir' should fail cleanly withing a repo. Bug #138600"""
-        shared_repo = self.make_repository('./foobar')
-        self.run_bzr(['mkdir', 'foobar/abc'], retcode=3)
-        self.failIfExists('foobar/abc')
-
-    def test_mkdir_outside_unversioned_dir(self):
-        """'mkdir' should fail with unversioned directory in path. Bug #138600"""
-        dir = pathjoin('.', 'unversioned_dir0')
-        newdir = pathjoin(dir, 'abc')
-        os.mkdir(dir)
-        self.run_bzr(['mkdir', newdir], retcode=3)
-        self.failIfExists(newdir)
-
-    def test_mkdir_inside_unversioned_dir(self):
-        """'mkdir' should fail cleanly from within an unversioned directory. Bug #138600"""
-        dir = pathjoin('.', 'unversioned_dir1')
-        os.mkdir(dir)
-        self.run_bzr(['mkdir', 'abc'], working_dir=dir, retcode=3)
-        newdir = pathjoin(dir, 'abc')
-        self.failIfExists(newdir)
-
-    def test_mkdir_outside_unversioned_dir_within_branch(self):
-        """'mkdir' should fail with unversioned directory inside branch. Bug #138600"""
-        b = 'foobar0'
-        self.make_branch_and_tree(b)
-        os.chdir(b)
-        dir = pathjoin('.', 'unversioned_dir0')
-        newdir = pathjoin(dir, 'abc')
-        os.mkdir(dir)
-        self.run_bzr(['mkdir', newdir], retcode=3)
-        self.failIfExists(newdir)
-
-    def test_mkdir_inside_unversioned_dir_within_branch(self):
-        """'mkdir' should fail cleanly from within an unversioned directory
-        inside branch. Bug #138600"""
-        b = 'foobar1'
-        self.make_branch_and_tree(b)
-        os.chdir(b)
-        dir = pathjoin('.', 'unversioned_dir1')
-        os.mkdir(dir)
-        self.run_bzr(['mkdir', 'abc'], working_dir=dir, retcode=3)
-        newdir = pathjoin(dir, 'abc')
-        self.failIfExists(newdir)
+    def test_mkdir_fails_cleanly(self):
+        """'mkdir' fails cleanly when no working tree is available.
+        https://bugs.edge.launchpad.net/bzr/+bug/138600
+        """
+        # Since there is a safety working tree above us, we create a bare repo
+        # here locally.
+        shared_repo = self.make_repository('.')
+        self.run_bzr(['mkdir', 'abc'], retcode=3)
+        self.failIfExists('abc')
 
 
 class TestVersioning(TestCaseInTempDir):