diff options
Diffstat (limited to 'messagebus')
82 files changed, 23 insertions, 179 deletions
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/routing/Resender.java b/messagebus/src/main/java/com/yahoo/messagebus/routing/Resender.java index 2813498babc..49419052f8f 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/routing/Resender.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/routing/Resender.java @@ -2,7 +2,10 @@ package com.yahoo.messagebus.routing; import com.yahoo.concurrent.SystemTimer; -import com.yahoo.messagebus.*; +import com.yahoo.messagebus.ErrorCode; +import com.yahoo.messagebus.Message; +import com.yahoo.messagebus.Reply; +import com.yahoo.messagebus.TraceLevel; import java.util.PriorityQueue; import java.util.LinkedList; @@ -17,7 +20,7 @@ import java.util.List; */ public class Resender { - private final PriorityQueue<Entry> queue = new PriorityQueue<Entry>(); + private final PriorityQueue<Entry> queue = new PriorityQueue<>(); private final RetryPolicy retryPolicy; /** @@ -46,7 +49,7 @@ public class Resender { * @param reply The reply to check. * @return True if retry is required. */ - public boolean shouldRetry(Reply reply) { + boolean shouldRetry(Reply reply) { int numErrors = reply.getNumErrors(); if (numErrors == 0) { return false; @@ -66,7 +69,7 @@ public class Resender { * @param node The node to resend. * @return True if the node was queued. */ - public boolean scheduleRetry(RoutingNode node) { + boolean scheduleRetry(RoutingNode node) { Message msg = node.getMessage(); if (!msg.getRetryEnabled()) { return false; @@ -84,7 +87,9 @@ public class Resender { node.getTrace().trace(TraceLevel.COMPONENT, "Message scheduled for retry " + retry + " in " + delay + " seconds."); msg.setRetry(retry); - queue.add(new Entry(node, SystemTimer.INSTANCE.milliTime() + (long)(delay * 1000))); + synchronized (queue) { + queue.add(new Entry(node, SystemTimer.INSTANCE.milliTime() + (long) (delay * 1000))); + } return true; } @@ -92,12 +97,14 @@ public class Resender { * Invokes {@link RoutingNode#send()} on all routing nodes that are applicable for sending at the current time. */ public void resendScheduled() { - if (queue.isEmpty()) return; - - List<RoutingNode> sendList = new LinkedList<RoutingNode>(); - long now = SystemTimer.INSTANCE.milliTime(); - while (!queue.isEmpty() && queue.peek().time <= now) { - sendList.add(queue.poll().node); + List<RoutingNode> sendList; + synchronized (queue) { + if (queue.isEmpty()) return; + sendList = new LinkedList<>(); + long now = SystemTimer.INSTANCE.milliTime(); + while (!queue.isEmpty() && queue.peek().time <= now) { + sendList.add(queue.poll().node); + } } for (RoutingNode node : sendList) { @@ -110,8 +117,10 @@ public class Resender { * Discards all the routing nodes currently scheduled for resending. */ public void destroy() { - while (!queue.isEmpty()) { - queue.poll().node.discard(); + synchronized (queue) { + while (!queue.isEmpty()) { + queue.poll().node.discard(); + } } } @@ -130,7 +139,7 @@ public class Resender { * @param node The routing node being scheduled. * @param time The time of this schedule. */ - public Entry(RoutingNode node, long time) { + Entry(RoutingNode node, long time) { this.node = node; this.time = time; } diff --git a/messagebus/src/tests/advancedrouting/DESC b/messagebus/src/tests/advancedrouting/DESC deleted file mode 100644 index 735d63dcdc3..00000000000 --- a/messagebus/src/tests/advancedrouting/DESC +++ /dev/null @@ -1 +0,0 @@ -advancedrouting test. Take a look at advancedrouting.cpp for details. diff --git a/messagebus/src/tests/advancedrouting/FILES b/messagebus/src/tests/advancedrouting/FILES deleted file mode 100644 index 61eb026ac3a..00000000000 --- a/messagebus/src/tests/advancedrouting/FILES +++ /dev/null @@ -1 +0,0 @@ -advancedrouting.cpp diff --git a/messagebus/src/tests/auto-reply/DESC b/messagebus/src/tests/auto-reply/DESC deleted file mode 100644 index 2aec186bfac..00000000000 --- a/messagebus/src/tests/auto-reply/DESC +++ /dev/null @@ -1,2 +0,0 @@ -Test that a deleted Message or Reply with a non-empty call-stack will -generate an automatic Reply. diff --git a/messagebus/src/tests/auto-reply/FILES b/messagebus/src/tests/auto-reply/FILES deleted file mode 100644 index 29f5dbbc1bb..00000000000 --- a/messagebus/src/tests/auto-reply/FILES +++ /dev/null @@ -1 +0,0 @@ -auto-reply.cpp diff --git a/messagebus/src/tests/blob/DESC b/messagebus/src/tests/blob/DESC deleted file mode 100644 index b2ba59c187f..00000000000 --- a/messagebus/src/tests/blob/DESC +++ /dev/null @@ -1 +0,0 @@ -Test the Blob and BlobRef classes. diff --git a/messagebus/src/tests/blob/FILES b/messagebus/src/tests/blob/FILES deleted file mode 100644 index fd1396e55e3..00000000000 --- a/messagebus/src/tests/blob/FILES +++ /dev/null @@ -1 +0,0 @@ -blob.cpp diff --git a/messagebus/src/tests/bucketsequence/DESC b/messagebus/src/tests/bucketsequence/DESC deleted file mode 100644 index b2e8d79519b..00000000000 --- a/messagebus/src/tests/bucketsequence/DESC +++ /dev/null @@ -1 +0,0 @@ -bucketsequence test. Take a look at bucketsequence.cpp for details. diff --git a/messagebus/src/tests/bucketsequence/FILES b/messagebus/src/tests/bucketsequence/FILES deleted file mode 100644 index 6db6cc0a2cd..00000000000 --- a/messagebus/src/tests/bucketsequence/FILES +++ /dev/null @@ -1 +0,0 @@ -bucketsequence.cpp diff --git a/messagebus/src/tests/choke/DESC b/messagebus/src/tests/choke/DESC deleted file mode 100644 index fd1d4965b7d..00000000000 --- a/messagebus/src/tests/choke/DESC +++ /dev/null @@ -1 +0,0 @@ -choke test. Take a look at choke.cpp for details. diff --git a/messagebus/src/tests/choke/FILES b/messagebus/src/tests/choke/FILES deleted file mode 100644 index 7a0d95feb52..00000000000 --- a/messagebus/src/tests/choke/FILES +++ /dev/null @@ -1 +0,0 @@ -choke.cpp diff --git a/messagebus/src/tests/configagent/DESC b/messagebus/src/tests/configagent/DESC deleted file mode 100644 index b4db2789b01..00000000000 --- a/messagebus/src/tests/configagent/DESC +++ /dev/null @@ -1,2 +0,0 @@ -Test that the config agent is able to configure a config handler using -config files. diff --git a/messagebus/src/tests/configagent/FILES b/messagebus/src/tests/configagent/FILES deleted file mode 100644 index 49fd8684ac1..00000000000 --- a/messagebus/src/tests/configagent/FILES +++ /dev/null @@ -1,3 +0,0 @@ -configagent.cpp -full.cfg -half.cfg diff --git a/messagebus/src/tests/context/DESC b/messagebus/src/tests/context/DESC deleted file mode 100644 index 5a40cc4f9a1..00000000000 --- a/messagebus/src/tests/context/DESC +++ /dev/null @@ -1 +0,0 @@ -context test. Take a look at context.cpp for details. diff --git a/messagebus/src/tests/context/FILES b/messagebus/src/tests/context/FILES deleted file mode 100644 index a4c148657b9..00000000000 --- a/messagebus/src/tests/context/FILES +++ /dev/null @@ -1 +0,0 @@ -context.cpp diff --git a/messagebus/src/tests/create-test.sh b/messagebus/src/tests/create-test.sh deleted file mode 100755 index cf979d56ddd..00000000000 --- a/messagebus/src/tests/create-test.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -gen_ignore_file() { - echo "generating '$1' ..." - echo ".depend" > $1 - echo "Makefile" >> $1 - echo "${test}_test" >> $1 -} - -gen_project_file() { - echo "generating '$1' ..." - echo "APPLICATION ${test}_test" > $1 - echo "OBJS $test" >> $1 - echo "LIBS messagebus/testlib/messagebus-test" >> $1 - echo "LIBS messagebus/messagebus" >> $1 - echo "EXTERNALLIBS slobrokserver slobrok fnet vespalib config vespalog" >> $1 - echo "" >> $1 - echo "CUSTOMMAKE" >> $1 - echo "test: depend ${test}_test" >> $1 - echo -e "\t@./${test}_test" >> $1 -} - -gen_source() { - echo "generating '$1' ..." - echo "#include <vespa/vespalib/testkit/testapp.h>" > $1 - echo "" >> $1 - echo "#include <vespa/log/log.h>" >> $1 - echo "LOG_SETUP(\"${test}_test\");" >> $1 - echo "" >> $1 - echo "// using namespace mbus;" >> $1 - echo "" >> $1 - echo "TEST_SETUP(Test);" >> $1 - echo "" >> $1 - echo "int" >> $1 - echo "Test::Main()" >> $1 - echo "{" >> $1 - echo " TEST_INIT(\"${test}_test\");" >> $1 - echo " TEST_DONE();" >> $1 - echo "}" >> $1 -} - -gen_desc() { - echo "generating '$1' ..." - echo "$test test. Take a look at $test.cpp for details." > $1 -} - -gen_file_list() { - echo "generating '$1' ..." - echo "$test.cpp" > $1 -} - -if [ $# -ne 1 ]; then - echo "usage: $0 <name>" - echo " name: name of the test to create" - exit 1 -fi - -test=$1 -if [ -e $test ]; then - echo "$test already present, don't want to mess it up..." - exit 1 -fi - -echo "creating directory '$test' ..." -mkdir -p $test || exit 1 -cd $test || exit 1 -test=`basename $test` - -gen_ignore_file .cvsignore -gen_project_file fastos.project -gen_source $test.cpp -gen_desc DESC -gen_file_list FILES diff --git a/messagebus/src/tests/emptyreply/DESC b/messagebus/src/tests/emptyreply/DESC deleted file mode 100644 index 4db41c3c671..00000000000 --- a/messagebus/src/tests/emptyreply/DESC +++ /dev/null @@ -1 +0,0 @@ -Simple test of the EmptyReply class. diff --git a/messagebus/src/tests/emptyreply/FILES b/messagebus/src/tests/emptyreply/FILES deleted file mode 100644 index 5fbc80bb05c..00000000000 --- a/messagebus/src/tests/emptyreply/FILES +++ /dev/null @@ -1 +0,0 @@ -emptyreply.cpp diff --git a/messagebus/src/tests/error/DESC b/messagebus/src/tests/error/DESC deleted file mode 100644 index 87bd0cc23fa..00000000000 --- a/messagebus/src/tests/error/DESC +++ /dev/null @@ -1 +0,0 @@ -error test. Take a look at error.cpp for details. diff --git a/messagebus/src/tests/error/FILES b/messagebus/src/tests/error/FILES deleted file mode 100644 index 779aee64a2c..00000000000 --- a/messagebus/src/tests/error/FILES +++ /dev/null @@ -1 +0,0 @@ -error.cpp diff --git a/messagebus/src/tests/identity/DESC b/messagebus/src/tests/identity/DESC deleted file mode 100644 index a1fdfb95f8b..00000000000 --- a/messagebus/src/tests/identity/DESC +++ /dev/null @@ -1 +0,0 @@ -Test that the network identity may be obtained from config. diff --git a/messagebus/src/tests/identity/FILES b/messagebus/src/tests/identity/FILES deleted file mode 100644 index 484caddcac7..00000000000 --- a/messagebus/src/tests/identity/FILES +++ /dev/null @@ -1,2 +0,0 @@ -identity.cpp -test.cfg diff --git a/messagebus/src/tests/loadbalance/DESC b/messagebus/src/tests/loadbalance/DESC deleted file mode 100644 index 67009371472..00000000000 --- a/messagebus/src/tests/loadbalance/DESC +++ /dev/null @@ -1,2 +0,0 @@ -Test that service patterns with '*' performs load balancing between -the services the pattern resolves to. diff --git a/messagebus/src/tests/loadbalance/FILES b/messagebus/src/tests/loadbalance/FILES deleted file mode 100644 index 6b28cce1716..00000000000 --- a/messagebus/src/tests/loadbalance/FILES +++ /dev/null @@ -1 +0,0 @@ -loadbalance.cpp diff --git a/messagebus/src/tests/messagebus/DESC b/messagebus/src/tests/messagebus/DESC deleted file mode 100644 index 19eb03c7048..00000000000 --- a/messagebus/src/tests/messagebus/DESC +++ /dev/null @@ -1 +0,0 @@ -Generic messagebus test ported from Java. diff --git a/messagebus/src/tests/messagebus/FILES b/messagebus/src/tests/messagebus/FILES deleted file mode 100644 index 0430f52149a..00000000000 --- a/messagebus/src/tests/messagebus/FILES +++ /dev/null @@ -1 +0,0 @@ -messagebus.cpp diff --git a/messagebus/src/tests/messageordering/DESC b/messagebus/src/tests/messageordering/DESC deleted file mode 100644 index a4e636441ac..00000000000 --- a/messagebus/src/tests/messageordering/DESC +++ /dev/null @@ -1 +0,0 @@ -messageordering test. Take a look at messageordering.cpp for details. diff --git a/messagebus/src/tests/messageordering/FILES b/messagebus/src/tests/messageordering/FILES deleted file mode 100644 index 51c47a40211..00000000000 --- a/messagebus/src/tests/messageordering/FILES +++ /dev/null @@ -1 +0,0 @@ -messageordering.cpp diff --git a/messagebus/src/tests/messenger/DESC b/messagebus/src/tests/messenger/DESC deleted file mode 100644 index f4b52840a14..00000000000 --- a/messagebus/src/tests/messenger/DESC +++ /dev/null @@ -1 +0,0 @@ -messenger test. Take a look at messenger.cpp for details. diff --git a/messagebus/src/tests/messenger/FILES b/messagebus/src/tests/messenger/FILES deleted file mode 100644 index 620b105632e..00000000000 --- a/messagebus/src/tests/messenger/FILES +++ /dev/null @@ -1 +0,0 @@ -messenger.cpp diff --git a/messagebus/src/tests/protocolrepository/DESC b/messagebus/src/tests/protocolrepository/DESC deleted file mode 100644 index 98e3dc9ef6e..00000000000 --- a/messagebus/src/tests/protocolrepository/DESC +++ /dev/null @@ -1 +0,0 @@ -protocolrepository test. Take a look at protocolrepository.cpp for details. diff --git a/messagebus/src/tests/protocolrepository/FILES b/messagebus/src/tests/protocolrepository/FILES deleted file mode 100644 index 2fc199b4aef..00000000000 --- a/messagebus/src/tests/protocolrepository/FILES +++ /dev/null @@ -1 +0,0 @@ -protocolrepository.cpp diff --git a/messagebus/src/tests/queue/DESC b/messagebus/src/tests/queue/DESC deleted file mode 100644 index 1d795755700..00000000000 --- a/messagebus/src/tests/queue/DESC +++ /dev/null @@ -1 +0,0 @@ -queue test. Take a look at queue.cpp for details. diff --git a/messagebus/src/tests/queue/FILES b/messagebus/src/tests/queue/FILES deleted file mode 100644 index 6fb01ca3173..00000000000 --- a/messagebus/src/tests/queue/FILES +++ /dev/null @@ -1 +0,0 @@ -queue.cpp diff --git a/messagebus/src/tests/replygate/DESC b/messagebus/src/tests/replygate/DESC deleted file mode 100644 index 2bb86cc490b..00000000000 --- a/messagebus/src/tests/replygate/DESC +++ /dev/null @@ -1 +0,0 @@ -replygate test. Take a look at replygate.cpp for details. diff --git a/messagebus/src/tests/replygate/FILES b/messagebus/src/tests/replygate/FILES deleted file mode 100644 index 3169994c2ca..00000000000 --- a/messagebus/src/tests/replygate/FILES +++ /dev/null @@ -1 +0,0 @@ -replygate.cpp diff --git a/messagebus/src/tests/resender/DESC b/messagebus/src/tests/resender/DESC deleted file mode 100644 index 0b234bf57b9..00000000000 --- a/messagebus/src/tests/resender/DESC +++ /dev/null @@ -1 +0,0 @@ -resender test. Take a look at resender.cpp for details. diff --git a/messagebus/src/tests/resender/FILES b/messagebus/src/tests/resender/FILES deleted file mode 100644 index 16b7c7fe76b..00000000000 --- a/messagebus/src/tests/resender/FILES +++ /dev/null @@ -1 +0,0 @@ -resender.cpp diff --git a/messagebus/src/tests/result/DESC b/messagebus/src/tests/result/DESC deleted file mode 100644 index 8192ff0830c..00000000000 --- a/messagebus/src/tests/result/DESC +++ /dev/null @@ -1 +0,0 @@ -Simple test of the Result class. diff --git a/messagebus/src/tests/result/FILES b/messagebus/src/tests/result/FILES deleted file mode 100644 index 55a888fd93f..00000000000 --- a/messagebus/src/tests/result/FILES +++ /dev/null @@ -1 +0,0 @@ -result.cpp diff --git a/messagebus/src/tests/retrypolicy/DESC b/messagebus/src/tests/retrypolicy/DESC deleted file mode 100644 index 0037ca01c5c..00000000000 --- a/messagebus/src/tests/retrypolicy/DESC +++ /dev/null @@ -1 +0,0 @@ -retrypolicy test. Take a look at retrypolicy.cpp for details. diff --git a/messagebus/src/tests/retrypolicy/FILES b/messagebus/src/tests/retrypolicy/FILES deleted file mode 100644 index 11a520524fb..00000000000 --- a/messagebus/src/tests/retrypolicy/FILES +++ /dev/null @@ -1 +0,0 @@ -retrypolicy.cpp diff --git a/messagebus/src/tests/routable/DESC b/messagebus/src/tests/routable/DESC deleted file mode 100644 index 2aa64df8271..00000000000 --- a/messagebus/src/tests/routable/DESC +++ /dev/null @@ -1 +0,0 @@ -routable test. Take a look at routable.cpp for details. diff --git a/messagebus/src/tests/routable/FILES b/messagebus/src/tests/routable/FILES deleted file mode 100644 index bacc8b159f8..00000000000 --- a/messagebus/src/tests/routable/FILES +++ /dev/null @@ -1 +0,0 @@ -routable.cpp diff --git a/messagebus/src/tests/routablequeue/DESC b/messagebus/src/tests/routablequeue/DESC deleted file mode 100644 index b1613b4b2f2..00000000000 --- a/messagebus/src/tests/routablequeue/DESC +++ /dev/null @@ -1 +0,0 @@ -routablequeue test. Take a look at routablequeue.cpp for details. diff --git a/messagebus/src/tests/routablequeue/FILES b/messagebus/src/tests/routablequeue/FILES deleted file mode 100644 index 44a342e00a3..00000000000 --- a/messagebus/src/tests/routablequeue/FILES +++ /dev/null @@ -1 +0,0 @@ -routablequeue.cpp diff --git a/messagebus/src/tests/routeparser/DESC b/messagebus/src/tests/routeparser/DESC deleted file mode 100644 index 4f38ec8b2bd..00000000000 --- a/messagebus/src/tests/routeparser/DESC +++ /dev/null @@ -1 +0,0 @@ -routeparser test. Take a look at routeparser.cpp for details. diff --git a/messagebus/src/tests/routeparser/FILES b/messagebus/src/tests/routeparser/FILES deleted file mode 100644 index 3a562440161..00000000000 --- a/messagebus/src/tests/routeparser/FILES +++ /dev/null @@ -1 +0,0 @@ -routeparser.cpp diff --git a/messagebus/src/tests/routing/DESC b/messagebus/src/tests/routing/DESC deleted file mode 100644 index bb46d61d6cc..00000000000 --- a/messagebus/src/tests/routing/DESC +++ /dev/null @@ -1 +0,0 @@ -routing test. Take a look at routing.cpp for details. diff --git a/messagebus/src/tests/routing/FILES b/messagebus/src/tests/routing/FILES deleted file mode 100644 index fec1f48186a..00000000000 --- a/messagebus/src/tests/routing/FILES +++ /dev/null @@ -1 +0,0 @@ -routing.cpp diff --git a/messagebus/src/tests/routingcontext/DESC b/messagebus/src/tests/routingcontext/DESC deleted file mode 100644 index 9e52d1d8055..00000000000 --- a/messagebus/src/tests/routingcontext/DESC +++ /dev/null @@ -1 +0,0 @@ -routingcontext test. Take a look at routingcontext.cpp for details. diff --git a/messagebus/src/tests/routingcontext/FILES b/messagebus/src/tests/routingcontext/FILES deleted file mode 100644 index 8eb1e780a73..00000000000 --- a/messagebus/src/tests/routingcontext/FILES +++ /dev/null @@ -1 +0,0 @@ -routingcontext.cpp diff --git a/messagebus/src/tests/routingspec/DESC b/messagebus/src/tests/routingspec/DESC deleted file mode 100644 index 28d7f54decc..00000000000 --- a/messagebus/src/tests/routingspec/DESC +++ /dev/null @@ -1 +0,0 @@ -routingspec test. Take a look at routingspec.cpp for details. diff --git a/messagebus/src/tests/routingspec/FILES b/messagebus/src/tests/routingspec/FILES deleted file mode 100644 index 4ae228ad5b9..00000000000 --- a/messagebus/src/tests/routingspec/FILES +++ /dev/null @@ -1 +0,0 @@ -routingspec.cpp diff --git a/messagebus/src/tests/rpcserviceaddress/DESC b/messagebus/src/tests/rpcserviceaddress/DESC deleted file mode 100644 index 2c0f5565509..00000000000 --- a/messagebus/src/tests/rpcserviceaddress/DESC +++ /dev/null @@ -1 +0,0 @@ -rpcserviceaddress test. Take a look at rpcserviceaddress.cpp for details. diff --git a/messagebus/src/tests/rpcserviceaddress/FILES b/messagebus/src/tests/rpcserviceaddress/FILES deleted file mode 100644 index ea9edf09a87..00000000000 --- a/messagebus/src/tests/rpcserviceaddress/FILES +++ /dev/null @@ -1 +0,0 @@ -rpcserviceaddress.cpp diff --git a/messagebus/src/tests/sendadapter/DESC b/messagebus/src/tests/sendadapter/DESC deleted file mode 100644 index 35a50283921..00000000000 --- a/messagebus/src/tests/sendadapter/DESC +++ /dev/null @@ -1 +0,0 @@ -sendadapter test. Take a look at sendadapter.cpp for details. diff --git a/messagebus/src/tests/sendadapter/FILES b/messagebus/src/tests/sendadapter/FILES deleted file mode 100644 index c43cbb6a53c..00000000000 --- a/messagebus/src/tests/sendadapter/FILES +++ /dev/null @@ -1 +0,0 @@ -sendadapter.cpp diff --git a/messagebus/src/tests/sequencer/DESC b/messagebus/src/tests/sequencer/DESC deleted file mode 100644 index 761c069aa92..00000000000 --- a/messagebus/src/tests/sequencer/DESC +++ /dev/null @@ -1 +0,0 @@ -sequencer test. Take a look at sequencer.cpp for details. diff --git a/messagebus/src/tests/sequencer/FILES b/messagebus/src/tests/sequencer/FILES deleted file mode 100644 index a8d6aeae540..00000000000 --- a/messagebus/src/tests/sequencer/FILES +++ /dev/null @@ -1 +0,0 @@ -sequencer.cpp diff --git a/messagebus/src/tests/serviceaddress/DESC b/messagebus/src/tests/serviceaddress/DESC deleted file mode 100644 index 38fa7c16b1a..00000000000 --- a/messagebus/src/tests/serviceaddress/DESC +++ /dev/null @@ -1 +0,0 @@ -serviceaddress test. Take a look at serviceaddress.cpp for details. diff --git a/messagebus/src/tests/serviceaddress/FILES b/messagebus/src/tests/serviceaddress/FILES deleted file mode 100644 index 37e17b66b5e..00000000000 --- a/messagebus/src/tests/serviceaddress/FILES +++ /dev/null @@ -1 +0,0 @@ -serviceaddress.cpp diff --git a/messagebus/src/tests/servicepool/DESC b/messagebus/src/tests/servicepool/DESC deleted file mode 100644 index 21484039b7a..00000000000 --- a/messagebus/src/tests/servicepool/DESC +++ /dev/null @@ -1 +0,0 @@ -servicepool test. Take a look at servicepool.cpp for details. diff --git a/messagebus/src/tests/servicepool/FILES b/messagebus/src/tests/servicepool/FILES deleted file mode 100644 index 22d1bbb2ba8..00000000000 --- a/messagebus/src/tests/servicepool/FILES +++ /dev/null @@ -1 +0,0 @@ -servicepool.cpp diff --git a/messagebus/src/tests/shutdown/DESC b/messagebus/src/tests/shutdown/DESC deleted file mode 100644 index 1f289ba9c23..00000000000 --- a/messagebus/src/tests/shutdown/DESC +++ /dev/null @@ -1 +0,0 @@ -shutdown test. Take a look at shutdown.cpp for details. diff --git a/messagebus/src/tests/shutdown/FILES b/messagebus/src/tests/shutdown/FILES deleted file mode 100644 index ce150a62325..00000000000 --- a/messagebus/src/tests/shutdown/FILES +++ /dev/null @@ -1 +0,0 @@ -shutdown.cpp diff --git a/messagebus/src/tests/simple-roundtrip/DESC b/messagebus/src/tests/simple-roundtrip/DESC deleted file mode 100644 index ad88203d593..00000000000 --- a/messagebus/src/tests/simple-roundtrip/DESC +++ /dev/null @@ -1 +0,0 @@ -simple-roundtrip test. Take a look at simple-roundtrip.cpp for details. diff --git a/messagebus/src/tests/simple-roundtrip/FILES b/messagebus/src/tests/simple-roundtrip/FILES deleted file mode 100644 index c6a24435fe2..00000000000 --- a/messagebus/src/tests/simple-roundtrip/FILES +++ /dev/null @@ -1 +0,0 @@ -simple-roundtrip.cpp diff --git a/messagebus/src/tests/simpleprotocol/DESC b/messagebus/src/tests/simpleprotocol/DESC deleted file mode 100644 index 91d0fa36c57..00000000000 --- a/messagebus/src/tests/simpleprotocol/DESC +++ /dev/null @@ -1,3 +0,0 @@ -Small test of the simple protocol defined in the test library. The -protocol will be used to test other messagebus features, including -cross-language compatibility. diff --git a/messagebus/src/tests/simpleprotocol/FILES b/messagebus/src/tests/simpleprotocol/FILES deleted file mode 100644 index f3c58f7d66e..00000000000 --- a/messagebus/src/tests/simpleprotocol/FILES +++ /dev/null @@ -1 +0,0 @@ -simpleprotocol.cpp diff --git a/messagebus/src/tests/slobrok/DESC b/messagebus/src/tests/slobrok/DESC deleted file mode 100644 index 7d68f120d91..00000000000 --- a/messagebus/src/tests/slobrok/DESC +++ /dev/null @@ -1,2 +0,0 @@ -A simple test to ensure we are able to perform -register/unregister/lookup of messagebus networks against the slobrok. diff --git a/messagebus/src/tests/slobrok/FILES b/messagebus/src/tests/slobrok/FILES deleted file mode 100644 index 3fc79ffa0cb..00000000000 --- a/messagebus/src/tests/slobrok/FILES +++ /dev/null @@ -1 +0,0 @@ -slobrok.cpp diff --git a/messagebus/src/tests/sourcesession/DESC b/messagebus/src/tests/sourcesession/DESC deleted file mode 100644 index 3417f6b602b..00000000000 --- a/messagebus/src/tests/sourcesession/DESC +++ /dev/null @@ -1,3 +0,0 @@ -Simple test to verify the basic behavior of the resender and sequencer -components in a full setup. This test is complemented by the resender -and sequencer tests. diff --git a/messagebus/src/tests/sourcesession/FILES b/messagebus/src/tests/sourcesession/FILES deleted file mode 100644 index b7d8703e7f9..00000000000 --- a/messagebus/src/tests/sourcesession/FILES +++ /dev/null @@ -1 +0,0 @@ -sourcesession.cpp diff --git a/messagebus/src/tests/targetpool/DESC b/messagebus/src/tests/targetpool/DESC deleted file mode 100644 index 8ba567d0efd..00000000000 --- a/messagebus/src/tests/targetpool/DESC +++ /dev/null @@ -1 +0,0 @@ -targetpool test. Take a look at targetpool.cpp for details. diff --git a/messagebus/src/tests/targetpool/FILES b/messagebus/src/tests/targetpool/FILES deleted file mode 100644 index 5fb34e2994b..00000000000 --- a/messagebus/src/tests/targetpool/FILES +++ /dev/null @@ -1 +0,0 @@ -targetpool.cpp diff --git a/messagebus/src/tests/throttling/DESC b/messagebus/src/tests/throttling/DESC deleted file mode 100644 index 4e8dfc56357..00000000000 --- a/messagebus/src/tests/throttling/DESC +++ /dev/null @@ -1 +0,0 @@ -throttling test. Take a look at throttling.cpp for details. diff --git a/messagebus/src/tests/throttling/FILES b/messagebus/src/tests/throttling/FILES deleted file mode 100644 index 037f6cd99b9..00000000000 --- a/messagebus/src/tests/throttling/FILES +++ /dev/null @@ -1 +0,0 @@ -throttling.cpp diff --git a/messagebus/src/tests/timeout/DESC b/messagebus/src/tests/timeout/DESC deleted file mode 100644 index c90169db16e..00000000000 --- a/messagebus/src/tests/timeout/DESC +++ /dev/null @@ -1 +0,0 @@ -timeout test. Take a look at timeout.cpp for details. diff --git a/messagebus/src/tests/timeout/FILES b/messagebus/src/tests/timeout/FILES deleted file mode 100644 index b36cdeb4ddf..00000000000 --- a/messagebus/src/tests/timeout/FILES +++ /dev/null @@ -1 +0,0 @@ -timeout.cpp diff --git a/messagebus/src/tests/trace-roundtrip/DESC b/messagebus/src/tests/trace-roundtrip/DESC deleted file mode 100644 index eb0d3b38e63..00000000000 --- a/messagebus/src/tests/trace-roundtrip/DESC +++ /dev/null @@ -1 +0,0 @@ -trace-roundtrip test. Take a look at trace-roundtrip.cpp for details. diff --git a/messagebus/src/tests/trace-roundtrip/FILES b/messagebus/src/tests/trace-roundtrip/FILES deleted file mode 100644 index 13b3374345f..00000000000 --- a/messagebus/src/tests/trace-roundtrip/FILES +++ /dev/null @@ -1 +0,0 @@ -trace-roundtrip.cpp |