From: Kefu Chai <kchai@redhat.com>
Date: Sun, 25 Jun 2017 14:48:21 +0000 (+0800)
Subject: test/test_async_driver: silence clang static analyzer warning
X-Git-Tag: v12.1.2~1^2~47^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9cc0cf4979fc71a528d720e1053a45f969cd5c66;p=ceph.git

test/test_async_driver: silence clang static analyzer warning

* silence the warning of: Value stored to 'r' is never read
* update the gtest assertions to be semantically more correct.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/test/msgr/test_async_driver.cc b/src/test/msgr/test_async_driver.cc
index e68e57b6ba83..08399dd47d7a 100644
--- a/src/test/msgr/test_async_driver.cc
+++ b/src/test/msgr/test_async_driver.cc
@@ -154,6 +154,7 @@ void* echoclient(void *arg)
   int connect_sd = ::socket(AF_INET, SOCK_STREAM, 0);
   if (connect_sd >= 0) {
     r = connect(connect_sd, (struct sockaddr*)&sa, sizeof(sa));
+    assert(r == 0);
     int t = 0;
   
     do {
@@ -226,21 +227,22 @@ TEST_P(EventDriverTest, NetworkSocketTest) {
     tv.tv_sec = 5;
     tv.tv_usec = 0;
     r = driver->event_wait(fired_events, &tv);
-    ASSERT_EQ(r, 1);
-    ASSERT_EQ(fired_events[0].mask, EVENT_READABLE);
+    ASSERT_EQ(1, r);
+    ASSERT_EQ(EVENT_READABLE, fired_events[0].mask);
 
     fired_events.clear();
     char data[100];
     r = ::read(client_sd, data, sizeof(data));
     if (r == 0)
       break;
-    ASSERT_TRUE(r > 0);
+    ASSERT_GT(r, 0);
     r = driver->add_event(client_sd, EVENT_READABLE, EVENT_WRITABLE);
+    ASSERT_EQ(0, r);
     r = driver->event_wait(fired_events, &tv);
-    ASSERT_EQ(r, 1);
+    ASSERT_EQ(1, r);
     ASSERT_EQ(fired_events[0].mask, EVENT_WRITABLE);
     r = write(client_sd, data, strlen(data));
-    ASSERT_EQ(r, (int)strlen(data));
+    ASSERT_EQ((int)strlen(data), r);
     driver->del_event(client_sd, EVENT_READABLE|EVENT_WRITABLE,
                       EVENT_WRITABLE);
   } while (1);