[PATCH] unionmount-testsuite: test rmdir of non-empty opaque dir

[PATCH] unionmount-testsuite: test rmdir of non-empty opaque dir

[Miklos Szeredi]

---
 tests/rmdir.py |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

--- a/tests/rmdir.py
+++ b/tests/rmdir.py
@@ -203,3 +203,19 @@ from errno import *
     ctx.rmdir(sym, err=ENOTDIR)
     ctx.rmdir(sym, err=ENOTDIR)
     ctx.rmdir(d, err=ENOENT)
+
+# Remove an empty lower directory, recreate, populate and try to remove
+def subtest_16(ctx):
+    """Remove non-empty opaque directory"""
+    d = ctx.empty_dir() + ctx.termslash()
+    f = d + "/b"
+
+    ctx.rmdir(d)
+    ctx.rmdir(d, err=ENOENT)
+    ctx.mkdir(d, 0o755)
+    ctx.open_file(f, wo=1, crt=1, ex=1, write="abcq")
+    ctx.rmdir(d, err=ENOTEMPTY)
+    ctx.unlink(f)
+    ctx.open_file(f, ro=1, err=ENOENT)
+    ctx.unlink(f, err=ENOENT)
+    ctx.rmdir(d)

Re: [PATCH] unionmount-testsuite: test rmdir of non-empty opaque dir

[Vincent Batts]

On Wed, May 13, 2015 at 11:15 AM, Miklos Szeredi <miklos@szeredi.hu> wrote:
> ---
>  tests/rmdir.py |   16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
>
> --- a/tests/rmdir.py
> +++ b/tests/rmdir.py
> @@ -203,3 +203,19 @@ from errno import *
>      ctx.rmdir(sym, err=ENOTDIR)
>      ctx.rmdir(sym, err=ENOTDIR)
>      ctx.rmdir(d, err=ENOENT)
> +
> +# Remove an empty lower directory, recreate, populate and try to remove
> +def subtest_16(ctx):
> +    """Remove non-empty opaque directory"""
> +    d = ctx.empty_dir() + ctx.termslash()
> +    f = d + "/b"
> +
> +    ctx.rmdir(d)
> +    ctx.rmdir(d, err=ENOENT)
> +    ctx.mkdir(d, 0o755)
> +    ctx.open_file(f, wo=1, crt=1, ex=1, write="abcq")
> +    ctx.rmdir(d, err=ENOTEMPTY)
> +    ctx.unlink(f)
> +    ctx.open_file(f, ro=1, err=ENOENT)
> +    ctx.unlink(f, err=ENOENT)
> +    ctx.rmdir(d)


I'm not familiar with this testsuite. The empty_dir will be on the
lower level, and all the rmdir, mkdir and create are happening on a
mounted union fs? I don't see where that is clear.

Re: [PATCH] unionmount-testsuite: test rmdir of non-empty opaque dir

[David Howells]

Vincent Batts <vbatts@gmail.com> wrote:

> I'm not familiar with this testsuite. The empty_dir will be on the
> lower level, and all the rmdir, mkdir and create are happening on a
> mounted union fs? I don't see where that is clear.

That's handled by the core of the test infrastructure:

	http://git.infradead.org/users/dhowells/unionmount-testsuite.git

Look in the base of the git tree.

The infrastructure creates a load of files and other objects then sets up the
requested union (unionmount, overlayfs or even no union at all) over them and
then runs all the tests.

David

Re: [PATCH] unionmount-testsuite: test rmdir of non-empty opaque dir

[Vincent Batts]

On Thu, May 14, 2015 at 6:46 AM, David Howells <dhowells@redhat.com> wrote:
> Vincent Batts <vbatts@gmail.com> wrote:
>
>> I'm not familiar with this testsuite. The empty_dir will be on the
>> lower level, and all the rmdir, mkdir and create are happening on a
>> mounted union fs? I don't see where that is clear.
>
> That's handled by the core of the test infrastructure:
>
>         http://git.infradead.org/users/dhowells/unionmount-testsuite.git
>
> Look in the base of the git tree.
>
> The infrastructure creates a load of files and other objects then sets up the
> requested union (unionmount, overlayfs or even no union at all) over them and
> then runs all the tests.
>
> David

RIght on. Thanks.

vb

Re: [PATCH] unionmount-testsuite: test rmdir of non-empty opaque dir

[David Howells]

Applied and pushed.  I've also pushed your overlayfs->overlay patch.

David