From 2f376a3edf6c1c6c49db822de17bbf0d3791775e Mon Sep 17 00:00:00 2001
From: Pau Espin Pedrol <pespin@sysmocom.de>
Date: Tue, 9 Jan 2018 19:45:15 +0100
Subject: [PATCH] tests: Sockets: adapt to have reproducible output and enable
 autotest

Change-Id: I5414076c6846b849973bcdeb3f2358b28dcb004c
---
 tests/CommonLibs/SocketsTest.cpp | 12 +++++++-----
 tests/CommonLibs/SocketsTest.ok  |  1 +
 tests/testsuite.at               | 10 +++++-----
 3 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 tests/CommonLibs/SocketsTest.ok

diff --git a/tests/CommonLibs/SocketsTest.cpp b/tests/CommonLibs/SocketsTest.cpp
index 3198a5e1..b51587d5 100644
--- a/tests/CommonLibs/SocketsTest.cpp
+++ b/tests/CommonLibs/SocketsTest.cpp
@@ -44,7 +44,7 @@ void *testReaderIP(void *)
 		char buf[MAX_UDP_LENGTH];
 		int count = readSocket.read(buf, MAX_UDP_LENGTH);
 		if (count>0) {
-			COUT("read: " << buf);
+			CERR("read: " << buf);
 			rc++;
 		} else {
 			sleep(2);
@@ -65,7 +65,7 @@ void *testReaderUnix(void *)
 		buf[MAX_UDP_LENGTH] =  '\0';
 		int count = readSocket.read(buf, MAX_UDP_LENGTH);
 		if (count>0) {
-			COUT("read: " << buf);
+			CERR("read: " << buf);
 			rc++;
 		} else {
 			sleep(2);
@@ -85,20 +85,22 @@ int main(int argc, char * argv[] )
 
   UDPSocket socket1("127.0.0.1", 5061, "127.0.0.1", 5934);
   UDDSocket socket1U("testSource","testDestination");
-  
-  COUT("socket1: " << socket1.port());
+
+  CERR("socket1: " << socket1.port());
 
   // give the readers time to open
   sleep(1);
 
   for (int i=0; i<gNumToSend; i++) {
-    socket1.write("Hello IP land");	
+    socket1.write("Hello IP land");
 	socket1U.write("Hello Unix domain");
 	sleep(1);
   }
 
   readerThreadIP.join();
   readerThreadUnix.join();
+
+  printf("Done\n");
 }
 
 // vim: ts=4 sw=4
diff --git a/tests/CommonLibs/SocketsTest.ok b/tests/CommonLibs/SocketsTest.ok
new file mode 100644
index 00000000..a965a70e
--- /dev/null
+++ b/tests/CommonLibs/SocketsTest.ok
@@ -0,0 +1 @@
+Done
diff --git a/tests/testsuite.at b/tests/testsuite.at
index f6b48afc..00e60023 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -26,11 +26,11 @@ cat $abs_srcdir/CommonLibs/PRBSTest.ok > expout
 AT_CHECK([$abs_top_builddir/tests/CommonLibs/PRBSTest], [], [expout], [])
 AT_CLEANUP
 
-#AT_SETUP([SocketsTest])
-#AT_KEYWORDS([SocketsTest])
-#cat $abs_srcdir/CommonLibs/SocketsTest.ok > expout
-#AT_CHECK([$abs_top_builddir/tests/CommonLibs/SocketsTest], [], [expout], [])
-#AT_CLEANUP
+AT_SETUP([SocketsTest])
+AT_KEYWORDS([SocketsTest])
+cat $abs_srcdir/CommonLibs/SocketsTest.ok > expout
+AT_CHECK([$abs_top_builddir/tests/CommonLibs/SocketsTest], [], [expout], [ignore])
+AT_CLEANUP
 
 AT_SETUP([TimevalTest])
 AT_KEYWORDS([TimevalTest])