mirror of
https://github.com/python/cpython.git
synced 2025-10-17 12:18:23 +00:00
Merged revisions 61520,61523-61528,61532 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r61520 | thomas.heller | 2008-03-18 16:03:17 +0100 (Di, 18 Mär 2008) | 5 lines Include <alloca.h> on Solaris, see issue #1506. It would probably be better to have a configure test for that, but this is outside of my configure expertise. ........ r61523 | brett.cannon | 2008-03-18 16:35:58 +0100 (Di, 18 Mär 2008) | 5 lines Remove all traces of HAVE_STRERROR. The removal of strerror.c led to the function check being removed from configure.in. ........ r61524 | brett.cannon | 2008-03-18 16:52:00 +0100 (Di, 18 Mär 2008) | 2 lines Fix test_errno to only check for error numbers that are defined by Standard C. ........ r61525 | steven.bethard | 2008-03-18 17:00:19 +0100 (Di, 18 Mär 2008) | 1 line Use test_support.unlink instead of os.unlink in tearDown(). (Seems to fix an occasional failure in Windows Vista.) ........ r61526 | brett.cannon | 2008-03-18 17:47:51 +0100 (Di, 18 Mär 2008) | 3 lines Cast the arguments to PyString_AsStringAndSize() to silence compiler warnings on OS X. ........ r61527 | sean.reifschneider | 2008-03-18 18:24:12 +0100 (Di, 18 Mär 2008) | 3 lines Issue 1577: shutil.move() where destination is a directory was doing a copy, now it is doing a os.rename() if it's on the same file-system. ........ r61528 | brett.cannon | 2008-03-18 18:25:13 +0100 (Di, 18 Mär 2008) | 12 lines Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does some verification: - Runs reindent.py on all .py files. - Checks if any changes in Doc exist. - Whether Misc/ACKS was changed. - Whether Misc/NEWS was changed. The hope is that ``make check`` can become a command anybody can run to get reminders about what all the requisite steps needed to create a proper patch/checkin. ........ r61532 | neal.norwitz | 2008-03-18 18:58:02 +0100 (Di, 18 Mär 2008) | 1 line Get regrtest working when re-running tests ........
This commit is contained in:
Christian Heimes
parent
430865fe26
commit
ada8c3b046
10 changed files with 243 additions and 93 deletions
|
|
@ -63,17 +63,6 @@ class TestShutil(unittest.TestCase):
|
|||
self.assertRaises(OSError, shutil.rmtree, path)
|
||||
os.remove(path)
|
||||
|
||||
def test_dont_move_dir_in_itself(self):
|
||||
src_dir = tempfile.mkdtemp()
|
||||
try:
|
||||
dst = os.path.join(src_dir, 'foo')
|
||||
self.assertRaises(shutil.Error, shutil.move, src_dir, dst)
|
||||
finally:
|
||||
try:
|
||||
os.rmdir(src_dir)
|
||||
except:
|
||||
pass
|
||||
|
||||
def test_copytree_simple(self):
|
||||
def write_data(path, data):
|
||||
f = open(path, "w")
|
||||
|
|
@ -162,9 +151,123 @@ class TestShutil(unittest.TestCase):
|
|||
shutil.rmtree(TESTFN, ignore_errors=True)
|
||||
|
||||
|
||||
class TestMove(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
filename = "foo"
|
||||
self.src_dir = tempfile.mkdtemp()
|
||||
self.dst_dir = tempfile.mkdtemp()
|
||||
self.src_file = os.path.join(self.src_dir, filename)
|
||||
self.dst_file = os.path.join(self.dst_dir, filename)
|
||||
# Try to create a dir in the current directory, hoping that it is
|
||||
# not located on the same filesystem as the system tmp dir.
|
||||
try:
|
||||
self.dir_other_fs = tempfile.mkdtemp(
|
||||
dir=os.path.dirname(__file__))
|
||||
self.file_other_fs = os.path.join(self.dir_other_fs,
|
||||
filename)
|
||||
except OSError:
|
||||
self.dir_other_fs = None
|
||||
with open(self.src_file, "wb") as f:
|
||||
f.write(b"spam")
|
||||
|
||||
def tearDown(self):
|
||||
for d in (self.src_dir, self.dst_dir, self.dir_other_fs):
|
||||
try:
|
||||
if d:
|
||||
shutil.rmtree(d)
|
||||
except:
|
||||
pass
|
||||
|
||||
def _check_move_file(self, src, dst, real_dst):
|
||||
contents = open(src, "rb").read()
|
||||
shutil.move(src, dst)
|
||||
self.assertEqual(contents, open(real_dst, "rb").read())
|
||||
self.assertFalse(os.path.exists(src))
|
||||
|
||||
def _check_move_dir(self, src, dst, real_dst):
|
||||
contents = sorted(os.listdir(src))
|
||||
shutil.move(src, dst)
|
||||
self.assertEqual(contents, sorted(os.listdir(real_dst)))
|
||||
self.assertFalse(os.path.exists(src))
|
||||
|
||||
def test_move_file(self):
|
||||
# Move a file to another location on the same filesystem.
|
||||
self._check_move_file(self.src_file, self.dst_file, self.dst_file)
|
||||
|
||||
def test_move_file_to_dir(self):
|
||||
# Move a file inside an existing dir on the same filesystem.
|
||||
self._check_move_file(self.src_file, self.dst_dir, self.dst_file)
|
||||
|
||||
def test_move_file_other_fs(self):
|
||||
# Move a file to an existing dir on another filesystem.
|
||||
if not self.dir_other_fs:
|
||||
# skip
|
||||
return
|
||||
self._check_move_file(self.src_file, self.file_other_fs,
|
||||
self.file_other_fs)
|
||||
|
||||
def test_move_file_to_dir_other_fs(self):
|
||||
# Move a file to another location on another filesystem.
|
||||
if not self.dir_other_fs:
|
||||
# skip
|
||||
return
|
||||
self._check_move_file(self.src_file, self.dir_other_fs,
|
||||
self.file_other_fs)
|
||||
|
||||
def test_move_dir(self):
|
||||
# Move a dir to another location on the same filesystem.
|
||||
dst_dir = tempfile.mktemp()
|
||||
try:
|
||||
self._check_move_dir(self.src_dir, dst_dir, dst_dir)
|
||||
finally:
|
||||
try:
|
||||
shutil.rmtree(dst_dir)
|
||||
except:
|
||||
pass
|
||||
|
||||
def test_move_dir_other_fs(self):
|
||||
# Move a dir to another location on another filesystem.
|
||||
if not self.dir_other_fs:
|
||||
# skip
|
||||
return
|
||||
dst_dir = tempfile.mktemp(dir=self.dir_other_fs)
|
||||
try:
|
||||
self._check_move_dir(self.src_dir, dst_dir, dst_dir)
|
||||
finally:
|
||||
try:
|
||||
shutil.rmtree(dst_dir)
|
||||
except:
|
||||
pass
|
||||
|
||||
def test_move_dir_to_dir(self):
|
||||
# Move a dir inside an existing dir on the same filesystem.
|
||||
self._check_move_dir(self.src_dir, self.dst_dir,
|
||||
os.path.join(self.dst_dir, os.path.basename(self.src_dir)))
|
||||
|
||||
def test_move_dir_to_dir_other_fs(self):
|
||||
# Move a dir inside an existing dir on another filesystem.
|
||||
if not self.dir_other_fs:
|
||||
# skip
|
||||
return
|
||||
self._check_move_dir(self.src_dir, self.dir_other_fs,
|
||||
os.path.join(self.dir_other_fs, os.path.basename(self.src_dir)))
|
||||
|
||||
def test_existing_file_inside_dest_dir(self):
|
||||
# A file with the same name inside the destination dir already exists.
|
||||
with open(self.dst_file, "wb"):
|
||||
pass
|
||||
self.assertRaises(shutil.Error, shutil.move, self.src_file, self.dst_dir)
|
||||
|
||||
def test_dont_move_dir_in_itself(self):
|
||||
# Moving a dir inside itself raises an Error.
|
||||
dst = os.path.join(self.src_dir, "bar")
|
||||
self.assertRaises(shutil.Error, shutil.move, self.src_dir, dst)
|
||||
|
||||
|
||||
|
||||
def test_main():
|
||||
test_support.run_unittest(TestShutil)
|
||||
test_support.run_unittest(TestShutil, TestMove)
|
||||
|
||||
if __name__ == '__main__':
|
||||
test_main()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue