From: Oleksii Beketov <ol.beketov@samsung.com>
Date: Mon, 17 Oct 2016 17:05:01 +0000 (+0300)
Subject: Unit tests for SSL adapter update
X-Git-Tag: 1.3.0~1055^2~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=71a47970f21dfd443cf16e6ca242b9eee0a13be5;p=platform%2Fupstream%2Fiotivity.git

Unit tests for SSL adapter update

Change-Id: Ib108dd1ce76632f1393383e6402e73c7ba2e60d7
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13349
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 2fe020f4bc86b7dcecc4a8853b7f772b591a010c)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13363
---

diff --git a/resource/csdk/connectivity/test/SConscript b/resource/csdk/connectivity/test/SConscript
index 906a2ba..ff90148 100644
--- a/resource/csdk/connectivity/test/SConscript
+++ b/resource/csdk/connectivity/test/SConscript
@@ -80,7 +80,7 @@ if (('IP' in target_transport) or ('ALL' in target_transport)):
 	if target_os != 'arduino':
 		tests_src = tests_src + ['cablocktransfertest.cpp']
 
-if catest_env.get('SECURED') == '1':
+if catest_env.get('SECURED') == '1' and catest_env.get('WITH_TCP') == True:
 	tests_src = tests_src + ['ssladapter_test.cpp']
 
 catests = catest_env.Program('catests', tests_src)
diff --git a/resource/csdk/connectivity/test/ssladapter_test.cpp b/resource/csdk/connectivity/test/ssladapter_test.cpp
index 61abdb0..5489b45 100644
--- a/resource/csdk/connectivity/test/ssladapter_test.cpp
+++ b/resource/csdk/connectivity/test/ssladapter_test.cpp
@@ -1439,7 +1439,7 @@ TEST(TLSAdaper, Test_3_0)
         exit(EXIT_FAILURE);
     }
 
-    sleep(1);
+    sleep(5);
 
     ret = pthread_create( &thread2, NULL, test0CAinitiateSslHandshake, &arg);
     if(ret)
@@ -1448,7 +1448,7 @@ TEST(TLSAdaper, Test_3_0)
         exit(EXIT_FAILURE);
     }
 
-    sleep(1);
+    sleep(5);
 
     EXPECT_EQ(0, arg);
 }
@@ -1588,7 +1588,7 @@ TEST(TLSAdaper, Test_4)
         exit(EXIT_FAILURE);
     }
 
-    sleep(1);
+    sleep(5);
 
     ret = pthread_create( &thread2, NULL, testCAencryptSsl, &arg);
     if(ret)
@@ -1597,7 +1597,7 @@ TEST(TLSAdaper, Test_4)
         exit(EXIT_FAILURE);
     }
 
-    sleep(1);
+    sleep(5);
 
     EXPECT_EQ(0, arg);
 }
@@ -1735,7 +1735,7 @@ TEST(TLSAdaper, Test_5)
         exit(EXIT_FAILURE);
     }
 
-    sleep(1);
+    sleep(5);
 
     ret = pthread_create( &thread2, NULL, testCAdecryptSsl, &arg);
     if(ret)
@@ -1744,7 +1744,7 @@ TEST(TLSAdaper, Test_5)
         exit(EXIT_FAILURE);
     }
 
-    sleep(1);
+    sleep(5);
 
     EXPECT_EQ(0, arg);
 }
@@ -1920,7 +1920,7 @@ TEST(TLSAdaper, Test_7)
         exit(EXIT_FAILURE);
     }
 
-    sleep(1);
+    sleep(5);
 
     ret = pthread_create( &thread2, NULL, client, (void*) NULL);
     if (ret)
@@ -1929,7 +1929,7 @@ TEST(TLSAdaper, Test_7)
         exit(EXIT_FAILURE);
     }
 
-    sleep(1);
+    sleep(5);
 
     EXPECT_EQ(NULL, arg);
 }
@@ -2224,7 +2224,7 @@ TEST(TLSAdaper, Test_11)
         exit(EXIT_FAILURE);
     }
 
-    sleep(1);
+    sleep(5);
 
     ret = pthread_create( &thread2, NULL, testCAsslGenerateOwnerPsk, &arg);
     if(ret)
@@ -2233,7 +2233,7 @@ TEST(TLSAdaper, Test_11)
         exit(EXIT_FAILURE);
     }
 
-    sleep(1);
+    sleep(5);
 
     EXPECT_EQ(0, arg);
 }