redis acl: temporary fix unittest

Author: davidpil2002

common/database_config.json

@@ -2,7 +2,7 @@
     "INSTANCES": {
         "redis":{
             "hostname" : "127.0.0.1",
-            "port" : 980,
+            "port" : 6379,
             "unix_socket_path" : "/var/run/redis/redis.sock"
         },
         "redis_chassis":{

common/dbinterface.h

@@ -106,7 +106,7 @@ class DBInterface
 
     std::string m_unix_socket_path;
     std::string m_host = "127.0.0.1";
-    int m_port = 980;
+    int m_port = 6379;
 };
 
 }

common/rediscommand.cpp

@@ -148,6 +148,7 @@ size_t RedisCommand::length() const
 {
     if (len <= 0)
         return 0;
+    // TODO review this casting
     return static_cast<size_t>(len);
 }
 

tests/redis_multi_db_ut_config/database_config.json

@@ -2,7 +2,7 @@
     "INSTANCES": {
         "redis":{
             "hostname" : "127.0.0.1",
-            "port": 980,
+            "port": 6379,
             "unix_socket_path": "/var/run/redis/redis.sock"
         },
         "redis1":{

tests/redis_multi_db_ut_config/database_config0.json

@@ -2,7 +2,7 @@
     "INSTANCES": {
         "redis":{
             "hostname" : "127.0.0.1",
-            "port": 980,
+            "port": 6379,
             "unix_socket_path": "/var/run/redis0/redis.sock"
         }
     },

tests/redis_multi_db_ut_config/database_config1.json

@@ -2,7 +2,7 @@
     "INSTANCES": {
         "redis":{
             "hostname" : "127.0.0.1",
-            "port": 980,
+            "port": 6379,
             "unix_socket_path": "/var/run/redis1/redis.sock"
         }
     },

tests/redis_ut.cpp

@@ -156,7 +156,7 @@ void TableBasicTest(string tableName, bool useDbId = false)
     int dbId = db1.getDbId();
 
     // Use dbId to construct a DBConnector
-    DBConnector db_dup(dbId, "localhost", 980, 0);
+    DBConnector db_dup(dbId, "localhost", 6379, 0);
     cout << "db_dup separator: " << SonicDBConfig::getSeparator(&db_dup) << endl;
 
     if (useDbId)
@@ -318,7 +318,7 @@ TEST(DBConnector, RedisClientName)
 TEST(DBConnector, DBInterface)
 {
     DBInterface dbintf;
-    dbintf.set_redis_kwargs("", "127.0.0.1", 980);
+    dbintf.set_redis_kwargs("", "127.0.0.1", 6379);
     dbintf.connect(15, "TEST_DB");
 
     SonicV2Connector_Native db;
@@ -851,8 +851,10 @@ TEST(Table, binary_data_get)
     DBConnector db("TEST_DB", 0, true);
     Table table(&db, "binary_data");
 
-    const char* bindata1 = "\x11\x00\x22\x33\x44";
-    const char* bindata2 = "\x11\x22\x33\x00\x44";
+    // const char* bindata1 = "\x11\x00\x22\x33\x44";
+    // const char* bindata2 = "\x11\x22\x33\x00\x44";
+    const char bindata1[] = "\x11\x00\x22\x33\x44";
+    const char bindata2[] = "\x11\x22\x33\x00\x44";
     auto v1 = std::string(bindata1, sizeof(bindata1));
     auto v2 = std::string(bindata2, sizeof(bindata2));
     vector<FieldValueTuple> values_set = {

tests/test_redis_ut.py

@@ -197,7 +197,7 @@ def thread_coming_data():
 
 def test_DBInterface():
     dbintf = DBInterface()
-    dbintf.set_redis_kwargs("", "127.0.0.1", 980)
+    dbintf.set_redis_kwargs("", "127.0.0.1", 6379)
     dbintf.connect(15, "TEST_DB")
 
     db = SonicV2Connector(use_unix_socket_path=True, namespace='')