From a6710b6c32933b9c68816c2d259de32c03a711b4 Mon Sep 17 00:00:00 2001 From: "James F. Carter" Date: Wed, 5 Oct 2016 10:57:52 +0100 Subject: [PATCH 1/2] update tests to reflect changes in handle storage --- tests/unit/check_nbdtypes.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/tests/unit/check_nbdtypes.c b/tests/unit/check_nbdtypes.c index 58e5b40..90d3f8d 100644 --- a/tests/unit/check_nbdtypes.c +++ b/tests/unit/check_nbdtypes.c @@ -88,14 +88,14 @@ START_TEST(test_request_handle) struct nbd_request_raw request_raw; struct nbd_request request; - memcpy( request_raw.handle, "MYHANDLE", 8 ); + memcpy( request_raw.handle.b, "MYHANDLE", 8 ); nbd_r2h_request( &request_raw, &request ); - memset( request_raw.handle, 0, 8 ); + request_raw.handle.w = 0; nbd_h2r_request( &request, &request_raw ); - fail_unless( memcmp( request.handle, "MYHANDLE", 8 ) == 0, "The handle was not copied." ); - fail_unless( memcmp( request_raw.handle, "MYHANDLE", 8 ) == 0, "The handle was not copied back." ); + fail_unless( memcmp( request.handle.b, "MYHANDLE", 8 ) == 0, "The handle was not copied." ); + fail_unless( memcmp( request_raw.handle.b, "MYHANDLE", 8 ) == 0, "The handle was not copied back." ); } END_TEST @@ -170,14 +170,14 @@ START_TEST(test_reply_handle) struct nbd_reply_raw reply_raw; struct nbd_reply reply; - memcpy( reply_raw.handle, "MYHANDLE", 8 ); + memcpy( reply_raw.handle.b, "MYHANDLE", 8 ); nbd_r2h_reply( &reply_raw, &reply ); - memset( reply_raw.handle, 0, 8 ); + reply_raw.handle.w = 0; nbd_h2r_reply( &reply, &reply_raw ); - fail_unless( memcmp( reply.handle, "MYHANDLE", 8 ) == 0, "The handle was not copied." ); - fail_unless( memcmp( reply_raw.handle, "MYHANDLE", 8 ) == 0, "The handle was not copied back." ); + fail_unless( memcmp( reply.handle.b, "MYHANDLE", 8 ) == 0, "The handle was not copied." ); + fail_unless( memcmp( reply_raw.handle.b, "MYHANDLE", 8 ) == 0, "The handle was not copied back." ); } END_TEST @@ -188,9 +188,8 @@ START_TEST( test_convert_from ) * nbd_request_raw */ struct nbd_request_raw request_raw; struct nbd_request request; - char readbuf[] = {0x80, 0, 0, 0, 0, 0, 0, 0}; - memcpy( &request_raw.from, readbuf, 8 ); + request_raw.from = 0x8000000000000000; nbd_r2h_request( &request_raw, &request ); From a09e14b2d465fea4d0fe593804db56f1804dc75f Mon Sep 17 00:00:00 2001 From: "James F. Carter" Date: Wed, 5 Oct 2016 11:06:39 +0100 Subject: [PATCH 2/2] whitespace fix --- tests/unit/check_nbdtypes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/check_nbdtypes.c b/tests/unit/check_nbdtypes.c index 90d3f8d..262d166 100644 --- a/tests/unit/check_nbdtypes.c +++ b/tests/unit/check_nbdtypes.c @@ -173,7 +173,7 @@ START_TEST(test_reply_handle) memcpy( reply_raw.handle.b, "MYHANDLE", 8 ); nbd_r2h_reply( &reply_raw, &reply ); - reply_raw.handle.w = 0; + reply_raw.handle.w = 0; nbd_h2r_reply( &reply, &reply_raw ); fail_unless( memcmp( reply.handle.b, "MYHANDLE", 8 ) == 0, "The handle was not copied." );