Hi!
Attached is a patch that fixes a warning in a vfs_fruit torture test. Please review&push if happy. Thanks! -slow -- Ralph Boehme, Samba Team https://samba.org/ Samba Developer, SerNet GmbH https://sernet.de/en/samba/ |
On Thu, Jan 11, 2018 at 03:34:46PM +0100, Ralph Böhme via samba-technical wrote:
> Hi! > > Attached is a patch that fixes a warning in a vfs_fruit torture test. > > Please review&push if happy. Thanks! RB+ if you change the spelling of "exptected_aapl_ctx_size" to "expected_aapl_ctx_size" :-). Jeremy. > -- > Ralph Boehme, Samba Team https://samba.org/ > Samba Developer, SerNet GmbH https://sernet.de/en/samba/ > From e2fe919bab1bcddef80a9ec7475b38fc8cb7efa3 Mon Sep 17 00:00:00 2001 > From: Ralph Boehme <[hidden email]> > Date: Thu, 11 Jan 2018 12:25:49 +0100 > Subject: [PATCH] s4/test: fix AAPL size check > > A recent commit changed the ModelString from "Samba" to "MacSamba". > > Signed-off-by: Ralph Boehme <[hidden email]> > --- > source4/torture/vfs/fruit.c | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/source4/torture/vfs/fruit.c b/source4/torture/vfs/fruit.c > index d071cf6f9af..db13125e2b8 100644 > --- a/source4/torture/vfs/fruit.c > +++ b/source4/torture/vfs/fruit.c > @@ -2040,6 +2040,7 @@ static bool test_aapl(struct torture_context *tctx, > unsigned int count; > union smb_search_data *d; > uint64_t rfork_len; > + bool is_osx_server = torture_setting_bool(tctx, "osx", false); > > smb2_deltree(tree, BASEDIR); > > @@ -2096,7 +2097,10 @@ static bool test_aapl(struct torture_context *tctx, > goto done; > } > > - if (aapl->data.length != 50) { > + if (!is_osx_server) { > + size_t exptected_aapl_ctx_size; > + bool size_ok; > + > /* > * uint32_t CommandCode = kAAPL_SERVER_QUERY > * uint32_t Reserved = 0; > @@ -2109,11 +2113,12 @@ static bool test_aapl(struct torture_context *tctx, > * kAAPL_CASE_SENSITIVE; > * uint32_t Pad2 = 0; > * uint32_t ModelStringLen = 10; > - * ucs2_t ModelString[5] = "Samba"; > + * ucs2_t ModelString[5] = "MacSamba"; > */ > - torture_warning(tctx, > - "(%s) unexpected AAPL context length: %zd, expected 50", > - __location__, aapl->data.length); > + exptected_aapl_ctx_size = strlen("MacSamba") * 2 + 40; > + > + size_ok = aapl->data.length == exptected_aapl_ctx_size; > + torture_assert_goto(tctx, size_ok, ret, done, "bad AAPL size"); > } > > aapl_cmd = IVAL(aapl->data.data, 0); > -- > 2.13.6 > |
On Thu, Jan 11, 2018 at 02:07:55PM -0800, Jeremy Allison wrote:
> On Thu, Jan 11, 2018 at 03:34:46PM +0100, Ralph Böhme via samba-technical wrote: > > Hi! > > > > Attached is a patch that fixes a warning in a vfs_fruit torture test. > > > > Please review&push if happy. Thanks! > > RB+ if you change the spelling of "exptected_aapl_ctx_size" > to "expected_aapl_ctx_size" :-). oh, copy&paste error. :) Attached patch fixes the copy, the source and another spelling mistake I spotted. -slow -- Ralph Boehme, Samba Team https://samba.org/ Samba Developer, SerNet GmbH https://sernet.de/en/samba/ |
Free forum by Nabble | Edit this page |