From 0f83ef395cccaa771543450ff8a4200da108e3d6 Mon Sep 17 00:00:00 2001
From: robert
Date: Mon, 4 May 2020 15:34:12 +0200
Subject: extmod/vfs_lfsx: Fix rename to respect cur dir for new path.

If the new name start with '/', cur_dir is not prepened any more, so that
the current working directory is respected.  And extend the test cases for
rename to cover this functionality.
---
 tests/extmod/vfs_lfs.py     | 12 +++++++++---
 tests/extmod/vfs_lfs.py.exp | 10 +++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'tests')

diff --git a/tests/extmod/vfs_lfs.py b/tests/extmod/vfs_lfs.py
index 82c8fead5..609d9f949 100644
--- a/tests/extmod/vfs_lfs.py
+++ b/tests/extmod/vfs_lfs.py
@@ -63,7 +63,7 @@ def test(bdev, vfs_class):
     # mkdir, rmdir
     vfs.mkdir("testdir")
     print(list(vfs.ilistdir()))
-    print(list(vfs.ilistdir("testdir")))
+    print(sorted(list(vfs.ilistdir("testdir"))))
     vfs.rmdir("testdir")
     print(list(vfs.ilistdir()))
     vfs.mkdir("testdir")
@@ -91,11 +91,17 @@ def test(bdev, vfs_class):
 
     # rename
     vfs.rename("testbig", "testbig2")
-    print(list(vfs.ilistdir()))
+    print(sorted(list(vfs.ilistdir())))
+    vfs.chdir("testdir")
+    vfs.rename("/testbig2", "testbig2")
+    print(sorted(list(vfs.ilistdir())))
+    vfs.rename("testbig2", "/testbig2")
+    vfs.chdir("/")
+    print(sorted(list(vfs.ilistdir())))
 
     # remove
     vfs.remove("testbig2")
-    print(list(vfs.ilistdir()))
+    print(sorted(list(vfs.ilistdir())))
 
     # getcwd, chdir
     vfs.mkdir("/testdir2")
diff --git a/tests/extmod/vfs_lfs.py.exp b/tests/extmod/vfs_lfs.py.exp
index 4cfd74b47..a70255774 100644
--- a/tests/extmod/vfs_lfs.py.exp
+++ b/tests/extmod/vfs_lfs.py.exp
@@ -16,7 +16,9 @@ write 1
 write 2
 write 3
 (1024, 1024, 30, 6, 6, 0, 0, 0, 0, 255)
-[('test', 32768, 0, 8), ('testdir', 16384, 0, 0), ('testbig2', 32768, 0, 16384)]
+[('test', 32768, 0, 8), ('testbig2', 32768, 0, 16384), ('testdir', 16384, 0, 0)]
+[('testbig2', 32768, 0, 16384)]
+[('test', 32768, 0, 8), ('testbig2', 32768, 0, 16384), ('testdir', 16384, 0, 0)]
 [('test', 32768, 0, 8), ('testdir', 16384, 0, 0)]
 /
 /testdir
@@ -51,8 +53,10 @@ write 1
 write 2
 write 3
 (1024, 1024, 30, 7, 7, 0, 0, 0, 0, 255)
-[('testbig2', 32768, 0, 16384), ('testdir', 16384, 0, 0), ('test', 32768, 0, 8)]
-[('testdir', 16384, 0, 0), ('test', 32768, 0, 8)]
+[('test', 32768, 0, 8), ('testbig2', 32768, 0, 16384), ('testdir', 16384, 0, 0)]
+[('testbig2', 32768, 0, 16384)]
+[('test', 32768, 0, 8), ('testbig2', 32768, 0, 16384), ('testdir', 16384, 0, 0)]
+[('test', 32768, 0, 8), ('testdir', 16384, 0, 0)]
 /
 /testdir
 (32768, 0, 0, 0, 0, 0, 0, 0, 0, 0)
-- 
cgit v1.2.3