<HTML><BODY><div class="js-helper js-readmsg-msg"><style type="text/css"></style><div><div id="style_15827265960167357435_BODY"><div class="class_1582735058"><div><div>Looks like this patch caused some tests to fail according to Sasha (avtikhon).</div><div>I made another commit fixing the issue.</div><div> </div><hr><div><div>Previous commit that was merged into master did not do<br>proper clean-up. That caused occasional failures of other<br>tests, all with the same error saying user 'guest' already<br>had access on universe.</div><div> </div><div>Closes #714<br>---<br>Branch:</div><div><a href="https://github.com/tarantool/tarantool/compare/eljashm/gh-714-box-schema-user-grant-invalid-error">https://github.com/tarantool/tarantool/compare/eljashm/gh-714-box-schema-user-grant-invalid-error</a> </div><div><br> test/box/access.result | 18 ++++++++++++------<br> test/box/access.test.lua | 10 ++++++----<br> 2 files changed, 18 insertions(+), 10 deletions(-)</div><div>diff --git a/test/box/access.result b/test/box/access.result<br>index b454d0eaa..e351eaf2c 100644<br>--- a/test/box/access.result<br>+++ b/test/box/access.result<br>@@ -2113,23 +2113,29 @@ box.space._priv:delete{1, 'universe', 0}<br> -- i.e. error on universally granted privileges shouldn't<br> -- include any redundant details and/or symbols.<br> --<br>-box.schema.user.grant('guest', 'read,write,execute', 'universe')<br>+box.schema.user.create('grantee')<br> ---<br> ...<br>-box.schema.user.grant('guest', 'read,write,execute', 'universe')<br>+box.schema.user.grant('grantee', 'read,write,execute', 'universe')<br> ---<br>-- error: User 'guest' already has read,write,execute access on universe<br>+...<br>+box.schema.user.grant('grantee', 'read,write,execute', 'universe')<br>+---<br>+- error: User 'grantee' already has read,write,execute access on universe<br> ...<br> -- Expected behavior of grant() error shouldn't change otherwise.<br> sp = box.schema.create_space('not_universe')<br> ---<br> ...<br>-box.schema.user.grant('guest', 'read,write,execute', 'space', 'not_universe')<br>+box.schema.user.grant('grantee', 'read,write,execute', 'space', 'not_universe')<br>+---<br>+...<br>+box.schema.user.grant('grantee', 'read,write,execute', 'space', 'not_universe')<br> ---<br>+- error: User 'grantee' already has read,write,execute access on space 'not_universe'<br> ...<br>-box.schema.user.grant('guest', 'read,write,execute', 'space', 'not_universe')<br>+box.schema.user.drop('grantee')<br> ---<br>-- error: User 'guest' already has read,write,execute access on space 'not_universe'<br> ...<br> sp:drop()<br> ---<br>diff --git a/test/box/access.test.lua b/test/box/access.test.lua<br>index 387c8b06b..6be558247 100644<br>--- a/test/box/access.test.lua<br>+++ b/test/box/access.test.lua<br>@@ -812,11 +812,13 @@ box.space._priv:delete{1, 'universe', 0}<br> -- i.e. error on universally granted privileges shouldn't<br> -- include any redundant details and/or symbols.<br> --<br>-box.schema.user.grant('guest', 'read,write,execute', 'universe')<br>-box.schema.user.grant('guest', 'read,write,execute', 'universe')<br>+box.schema.user.create('grantee')<br>+box.schema.user.grant('grantee', 'read,write,execute', 'universe')<br>+box.schema.user.grant('grantee', 'read,write,execute', 'universe')<br> <br> -- Expected behavior of grant() error shouldn't change otherwise.<br> sp = box.schema.create_space('not_universe')<br>-box.schema.user.grant('guest', 'read,write,execute', 'space', 'not_universe')<br>-box.schema.user.grant('guest', 'read,write,execute', 'space', 'not_universe')<br>+box.schema.user.grant('grantee', 'read,write,execute', 'space', 'not_universe')<br>+box.schema.user.grant('grantee', 'read,write,execute', 'space', 'not_universe')<br>+box.schema.user.drop('grantee')<br> sp:drop()<br>-- <br>2.24.0</div></div><blockquote style="border-left:1px solid #0857A6;margin:10px;padding:0 0 0 10px;"><span data-email="kyukhin@tarantool.org" data-name="Kirill Yukhin" data-quote-id="1699439864519839959" data-timestamp="1582669200" data-type="sender">Среда, 26 февраля 2020, 1:20 +03:00 от Kirill Yukhin <<a href="/compose?To=kyukhin@tarantool.org">kyukhin@tarantool.org</a>>:<br> </span><div data-quote-id="1699439864519839959" data-type="body"><div id=""><div class="js-helper_mailru_css_attribute_postfix js-readmsg-msg_mailru_css_attribute_postfix"><style type="text/css"></style><div><div id="style_15826692161565282535_BODY_mailru_css_attribute_postfix">Hello,<br><br>On 19 фев 19:35, Maria Khaydich wrote:<div class="mail-quote-collapse">><br>> Error message on granted privileges was not flexible and<br>> did not distinguish between universal or any other priviliges<br>> leaving either 'nil' or simply '' at the end.<br>> <br>> Closes #714<br>> ----------------------------------------------------------------------<br>> Issue:<br>> <a href="https://github.com/tarantool/tarantool/issues/714" rel="noopener noreferrer" target="_blank">https://github.com/tarantool/tarantool/issues/714</a> <br>> Branch:<br>> <a href="https://github.com/tarantool/tarantool/tree/eljashm/gh-714-box-schema-user-grant-invalid-error" rel="noopener noreferrer" target="_blank">https://github.com/tarantool/tarantool/tree/eljashm/gh-714-box-schema-user-grant-invalid-error</a> </div><br>I've checked your patch into master.<br><br>--<br>Regards, Kirill Yukhin</div></div></div></div></div></blockquote> <div> </div><div data-signature-widget="container"><div data-signature-widget="content"><div>--<br>Maria Khaydich</div></div></div><div> </div></div></div></div></div></div><div> </div></BODY></HTML>