diff options
Diffstat (limited to 'test/t/test_chown.py')
-rw-r--r-- | test/t/test_chown.py | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/test/t/test_chown.py b/test/t/test_chown.py index 37221cfa..9643f3eb 100644 --- a/test/t/test_chown.py +++ b/test/t/test_chown.py @@ -2,7 +2,7 @@ import getpass import pytest -from conftest import assert_bash_exec, assert_complete +from conftest import assert_complete @pytest.mark.bashcomp( @@ -16,10 +16,8 @@ class TestChown: getpass.getuser() != "root", reason="Only root can chown to all users" ) @pytest.mark.complete("chown ") - def test_1(self, bash, completion): - users = sorted( - assert_bash_exec(bash, "compgen -A user", want_output=True).split() - ) + def test_1(self, bash, completion, output_sort_uniq): + users = output_sort_uniq("compgen -u") assert completion == users @pytest.mark.complete("chown foo: shared/default/") @@ -33,37 +31,39 @@ class TestChown: def test_4(self, bash, part_full_user): part, full = part_full_user completion = assert_complete(bash, "chown %s" % part) - assert completion == full + assert completion == full[len(part) :] assert completion.endswith(" ") def test_5(self, bash, part_full_user, part_full_group): _, user = part_full_user partgroup, fullgroup = part_full_group completion = assert_complete(bash, "chown %s:%s" % (user, partgroup)) - assert completion == "%s:%s" % (user, fullgroup) + assert completion == fullgroup[len(partgroup) :] assert completion.output.endswith(" ") def test_6(self, bash, part_full_group): part, full = part_full_group completion = assert_complete(bash, "chown dot.user:%s" % part) - assert completion == "dot.user:%s" % full + assert completion == full[len(part) :] assert completion.output.endswith(" ") - @pytest.mark.xfail # TODO check escaping, whitespace - def test_7(self, bash, part_full_group): - """Test preserving special chars in $prefix$partgroup<TAB>.""" - part, full = part_full_group - for prefix in ( + @pytest.mark.parametrize( + "prefix", + [ r"funky\ user:", "funky.user:", r"funky\.user:", r"fu\ nky.user:", r"f\ o\ o\.\bar:", r"foo\_b\ a\.r\ :", - ): - completion = assert_complete(bash, "chown %s%s" % (prefix, part)) - assert completion == "%s%s" % (prefix, full) - assert completion.output.endswith(" ") + ], + ) + def test_7(self, bash, part_full_group, prefix): + """Test preserving special chars in $prefix$partgroup<TAB>.""" + part, full = part_full_group + completion = assert_complete(bash, "chown %s%s" % (prefix, part)) + assert completion == full[len(part) :] + assert completion.output.endswith(" ") def test_8(self, bash, part_full_user, part_full_group): """Test giving up on degenerate cases instead of spewing junk.""" |