You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by bp...@apache.org on 2015/12/02 15:22:58 UTC
celix git commit: CELIX-315: add sleep to ensure that old endpoints
are dropped before continuing with next test
Repository: celix
Updated Branches:
refs/heads/develop fdf9050b9 -> 2260c4f43
CELIX-315: add sleep to ensure that old endpoints are dropped before continuing with next test
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/2260c4f4
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/2260c4f4
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/2260c4f4
Branch: refs/heads/develop
Commit: 2260c4f43849ac3ee233f9d02783f403baf49b81
Parents: fdf9050
Author: Bjoern Petri <bp...@apache.org>
Authored: Wed Dec 2 15:22:22 2015 +0100
Committer: Bjoern Petri <bp...@apache.org>
Committed: Wed Dec 2 15:22:22 2015 +0100
----------------------------------------------------------------------
.../private/test/rsa_client_server_tests.cpp | 13 +++++++++++--
.../private/test/rsa_client_server_tests.cpp | 10 ++++++++++
2 files changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/2260c4f4/remote_services/remote_service_admin_http/private/test/rsa_client_server_tests.cpp
----------------------------------------------------------------------
diff --git a/remote_services/remote_service_admin_http/private/test/rsa_client_server_tests.cpp b/remote_services/remote_service_admin_http/private/test/rsa_client_server_tests.cpp
index 5c88b99..f26bdf3 100644
--- a/remote_services/remote_service_admin_http/private/test/rsa_client_server_tests.cpp
+++ b/remote_services/remote_service_admin_http/private/test/rsa_client_server_tests.cpp
@@ -383,6 +383,12 @@ extern "C" {
status = stopStartPermutation(serverContext, singlePermutation, arrayList_size(rsaBundles));
CHECK_EQUAL(CELIX_SUCCESS, status);
+ /* we need to sleep here for a bit to ensure
+ * that the client has flushed the old discovery
+ * values
+ */
+ sleep(2);
+
// check whether calc service is available
test1();
@@ -423,6 +429,7 @@ extern "C" {
arrayList_destroy(proxyBundle);
}
+ /*
static void testEndpointRemoval(void) {
celix_status_t status;
bundle_pt bundle = NULL;
@@ -451,6 +458,7 @@ extern "C" {
arrayList_destroy(bundleNames);
arrayList_destroy(endpointBundle);
}
+ */
}
TEST_GROUP(RsaHttpClientServerTests) {
@@ -478,9 +486,10 @@ TEST(RsaHttpClientServerTests, TestExport) {
TEST(RsaHttpClientServerTests, TestProxyRemoval) {
testProxyRemoval();
}
-
+/*
TEST(RsaHttpClientServerTests, TestEndpointRemoval) {
// test is currenlty failing
- //testEndpointRemoval();
+ testEndpointRemoval();
}
+*/
http://git-wip-us.apache.org/repos/asf/celix/blob/2260c4f4/remote_services/remote_service_admin_shm/private/test/rsa_client_server_tests.cpp
----------------------------------------------------------------------
diff --git a/remote_services/remote_service_admin_shm/private/test/rsa_client_server_tests.cpp b/remote_services/remote_service_admin_shm/private/test/rsa_client_server_tests.cpp
index 102c0b1..2e80521 100644
--- a/remote_services/remote_service_admin_shm/private/test/rsa_client_server_tests.cpp
+++ b/remote_services/remote_service_admin_shm/private/test/rsa_client_server_tests.cpp
@@ -380,6 +380,12 @@ extern "C" {
status = stopStartPermutation(serverContext, singlePermutation, arrayList_size(rsaBundles));
CHECK_EQUAL(CELIX_SUCCESS, status);
+ /* we need to sleep here for a bit to ensure
+ * that the client has flushed the old discovery
+ * values
+ */
+ sleep(2);
+
// check whether calc service is available
test1();
@@ -391,6 +397,7 @@ extern "C" {
arrayList_destroy(rsaBundles);
}
+ /*
static void testProxyRemoval(void) {
celix_status_t status;
bundle_pt bundle = NULL;
@@ -419,7 +426,9 @@ extern "C" {
arrayList_destroy(bundleNames);
arrayList_destroy(proxyBundle);
}
+ */
+ /*
static void testEndpointRemoval(void) {
celix_status_t status;
bundle_pt bundle = NULL;
@@ -448,6 +457,7 @@ extern "C" {
arrayList_destroy(bundleNames);
arrayList_destroy(endpointBundle);
}
+ */
}
TEST_GROUP(RsaShmClientServerTests) {