[med-svn] [ball] 01/04: Drop test that leads frequently to unpredictable failures
Andreas Tille
tille at debian.org
Thu Sep 21 14:23:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository ball.
commit 9d091558b3613b86840935bb6ef85838a0db55bd
Author: Andreas Tille <tille at debian.org>
Date: Thu Sep 21 11:22:14 2017 +0200
Drop test that leads frequently to unpredictable failures
---
debian/changelog | 1 +
.../increase-sleeping-time-on-Socket_test.patch | 12 +-
debian/patches/remove_Socket_test.patch | 131 +++++++++++++++++++++
debian/patches/series | 3 +-
4 files changed, 141 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1b48261..05db3d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ball (1.4.3~beta1-4) UNRELEASED; urgency=medium
* Add dh_sip after dh_install (Thanks for the hint to Dmitry Shachnev
<mitya57 at debian.org>)
* Do not run test suite parallel
+ * Drop test that leads frequently to unpredictable failures
-- Andreas Tille <tille at debian.org> Tue, 19 Sep 2017 20:25:18 +0200
diff --git a/debian/patches/increase-sleeping-time-on-Socket_test.patch b/debian/patches/increase-sleeping-time-on-Socket_test.patch
index 667d802..9ac0024 100644
--- a/debian/patches/increase-sleeping-time-on-Socket_test.patch
+++ b/debian/patches/increase-sleeping-time-on-Socket_test.patch
@@ -2,8 +2,10 @@ From f646875d85964ade76af5bb2db6f3675f3ae3998 Mon Sep 17 00:00:00 2001
From: philthiel <thiel at informatik.uni-tuebingen.de>
Date: Mon, 9 May 2016 12:55:35 +0200
Subject: [PATCH] Increased sleeping time in Socket_test
+ The test quite often failed in build slaves because startup time was too short.
+ .
+ Andreas Tille: Deactivated this in favour to drop this test at all
-The test quite often failed in build slaves because startup time was too short.
---
source/TEST/Socket_test.C | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
@@ -17,12 +19,12 @@ index 1b69460..0285425 100644
Size port = server.getPort();
- // starting up can take a few moments, so we wait up to 1 second
-+ // starting up can take a few moments, so we wait up to 2 second
++ // starting up can take a few moments, so we wait up to 4 second
Size retries = 0;
while ((port == 0) && (retries < 10))
{
- sleepFor(100);
-+ sleepFor(200);
++ sleepFor(400);
port = server.getPort();
++retries;
}
@@ -31,12 +33,12 @@ index 1b69460..0285425 100644
Size port = server.getPort();
- // starting up can take a few moments, so we wait up to 1 second
-+ // starting up can take a few moments, so we wait up to 2 second
++ // starting up can take a few moments, so we wait up to 4 second
Size retries = 0;
while ((port == 0) && (retries < 10))
{
- sleepFor(100);
-+ sleepFor(200);
++ sleepFor(400);
port = server.getPort();
++retries;
}
diff --git a/debian/patches/remove_Socket_test.patch b/debian/patches/remove_Socket_test.patch
new file mode 100644
index 0000000..bbca7c5
--- /dev/null
+++ b/debian/patches/remove_Socket_test.patch
@@ -0,0 +1,131 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Thu, 21 Sep 2017 09:12:27 +0200
+Description: Drop test that leads frequently to unpredictable failures
+
+--- a/source/TEST/Socket_test.C
++++ /dev/null
+@@ -1,124 +0,0 @@
+-// -*- Mode: C++; tab-width: 2; -*-
+-// vi: set ts=2:
+-//
+-
+-
+-#include <BALL/CONCEPT/classTest.h>
+-
+-///////////////////////////
+-#include <BALL/SYSTEM/networking.h>
+-#include <BALL/SYSTEM/systemCalls.h> // for sleepFor()
+-
+-///////////////////////////
+-
+-using namespace BALL;
+-
+-class SimpleTCPServerTestThread
+- : public TCPServerThread
+-{
+- public:
+- SimpleTCPServerTestThread(Size port, bool async, bool restart)
+- : TCPServerThread(port, async, restart),
+- sent_async("HelloAsync!"),
+- sent_sync("HelloSync!")
+- {}
+-
+- void handleConnection()
+- {
+- getline(connected_stream_, received);
+-
+- connected_stream_ << sent_sync << std::endl;
+- }
+-
+- void handleAsyncConnection()
+- {
+- getline(connected_stream_, received);
+-
+- connected_stream_ << sent_async << std::endl;
+- }
+-
+- String received;
+- String sent_async;
+- String sent_sync;
+-};
+-
+-START_TEST(Socket)
+-using namespace BALL;
+-
+-/////////////////////////////////////////////////////////////
+-/////////////////////////////////////////////////////////////
+-
+-CHECK([EXTRA] simple asynchronous socket transmission to/from threaded server)
+- SimpleTCPServerTestThread server(0, true, false);
+- server.start();
+-
+- Size port = server.getPort();
+-
+- // starting up can take a few moments, so we wait up to 1 second
+- Size retries = 0;
+- while ((port == 0) && (retries < 10))
+- {
+- sleepFor(100);
+- port = server.getPort();
+- ++retries;
+- }
+-
+- TEST_NOT_EQUAL(port, 0);
+- if (port > 0)
+- {
+- String sent("Hello, world!");
+-
+- TCPIOStream stream("localhost", port);
+- stream << sent << std::endl;
+-
+- String received;
+- stream >> received;
+-
+- sleepFor(10);
+- TEST_EQUAL(sent, server.received);
+- TEST_EQUAL(received, server.sent_async);
+- }
+- server.deactivate();
+- server.terminate();
+- server.wait();
+-RESULT
+-
+-CHECK([EXTRA] simple synchronous socket transmission to/from threaded server)
+- SimpleTCPServerTestThread server(0, false, false);
+- server.start();
+-
+- Size port = server.getPort();
+-
+- // starting up can take a few moments, so we wait up to 1 second
+- Size retries = 0;
+- while ((port == 0) && (retries < 10))
+- {
+- sleepFor(100);
+- port = server.getPort();
+- ++retries;
+- }
+-
+- TEST_NOT_EQUAL(port, 0);
+- if (port > 0)
+- {
+- String sent("Hello, world!");
+-
+- TCPIOStream stream("localhost", port);
+- stream << sent << std::endl;
+-
+- String received;
+- stream >> received;
+- sleepFor(10);
+- TEST_EQUAL(sent, server.received);
+- TEST_EQUAL(received, server.sent_sync);
+- }
+-
+- server.deactivate();
+- server.terminate();
+- server.wait();
+-RESULT
+-
+-
+-/////////////////////////////////////////////////////////////
+-/////////////////////////////////////////////////////////////
+-END_TEST
diff --git a/debian/patches/series b/debian/patches/series
index b0e9d3c..9c83170 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,7 +8,8 @@ findsip.patch
disable-assign-positions-from-template.patch
fix-FingerprintSimilarityClustering.patch
fix-Python-bindings-for-Box.patch
-increase-sleeping-time-on-Socket_test.patch
+# increase-sleeping-time-on-Socket_test.patch - remove this test at all
+remove_Socket_test.patch
modify-rtti-isKindOf-to-take-pointer.patch
fix-PoseClustering_Test-replace-file-compare-with-deserialize.patch
fix-XDRPersistenceManager_test.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ball.git
More information about the debian-med-commit
mailing list