[GNUnet-SVN] [gnunet] branch master updated (961e98d27 -> 0c7478479)

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated (961e98d27 -> 0c7478479)

From:	gnunet
Subject:	[GNUnet-SVN] [gnunet] branch master updated (961e98d27 -> 0c7478479)
Date:	Tue, 21 Feb 2017 20:14:52 +0100
This is an automated email from the git hooks/post-receive script.

grothoff pushed a change to branch master
in repository gnunet.

    from 961e98d27 ignore new testcases
     new a1ea03e3a enforce sequential test order (#4860)
     new 6ffe3aeea handle errors without crashing
     new 0c7478479 update .ignore file

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/namestore/.gitignore                  |  30 ++++----
 src/namestore/Makefile.am                 | 111 +++++++++++++++++-------------
 src/namestore/test_namestore_api_remove.c |  18 +++--
 3 files changed, 92 insertions(+), 67 deletions(-)

diff --git a/src/namestore/.gitignore b/src/namestore/.gitignore
index a1153c6f9..6943b888a 100644
--- a/src/namestore/.gitignore
+++ b/src/namestore/.gitignore
@@ -1,20 +1,20 @@
 gnunet-service-namestore
 gnunet-namestore
 gnunet-namestore-fcfsd
-test_namestore_api_lookup_nick
-test_namestore_api_lookup_private
-test_namestore_api_lookup_public
-test_namestore_api_lookup_shadow
-test_namestore_api_lookup_shadow_filter
-test_namestore_api_monitoring
-test_namestore_api_monitoring_existing
-test_namestore_api_remove
-test_namestore_api_remove_not_existing_record
-test_namestore_api_store
-test_namestore_api_store_update
-test_namestore_api_zone_iteration
-test_namestore_api_zone_iteration_nick
-test_namestore_api_zone_iteration_specific_zone
-test_namestore_api_zone_iteration_stop
+test_namestore_api_lookup_nick.nc
+test_namestore_api_lookup_private.nc
+test_namestore_api_lookup_public.nc
+test_namestore_api_lookup_shadow.nc
+test_namestore_api_lookup_shadow_filter.nc
+test_namestore_api_monitoring.nc
+test_namestore_api_monitoring_existing.nc
+test_namestore_api_remove.nc
+test_namestore_api_remove_not_existing_record.nc
+test_namestore_api_store.nc
+test_namestore_api_store_update.nc
+test_namestore_api_zone_iteration.nc
+test_namestore_api_zone_iteration_nick.nc
+test_namestore_api_zone_iteration_specific_zone.nc
+test_namestore_api_zone_iteration_stop.nc
 test_plugin_namestore_postgres
 test_plugin_namestore_sqlite
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index a441f5d70..e9b0f179a 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -45,24 +45,43 @@ endif
 # testcases do not even build yet; thus: experimental!
 if HAVE_TESTING
 TESTING_TESTS = \
- test_namestore_api_store \
- test_namestore_api_store_update \
- test_namestore_api_lookup_public \
- test_namestore_api_lookup_private \
- test_namestore_api_lookup_nick \
- test_namestore_api_lookup_shadow \
- test_namestore_api_lookup_shadow_filter \
- test_namestore_api_remove \
- test_namestore_api_remove_not_existing_record \
- test_namestore_api_zone_iteration \
- test_namestore_api_zone_iteration_nick \
- test_namestore_api_zone_iteration_specific_zone \
- test_namestore_api_zone_iteration_stop \
- test_namestore_api_monitoring \
- test_namestore_api_monitoring_existing
+ test_namestore_api_store.nc \
+ test_namestore_api_store_update.nc \
+ test_namestore_api_lookup_public.nc \
+ test_namestore_api_lookup_private.nc \
+ test_namestore_api_lookup_nick.nc \
+ test_namestore_api_lookup_shadow.nc \
+ test_namestore_api_lookup_shadow_filter.nc \
+ test_namestore_api_remove.nc \
+ test_namestore_api_remove_not_existing_record.nc \
+ test_namestore_api_zone_iteration.nc \
+ test_namestore_api_zone_iteration_nick.nc \
+ test_namestore_api_zone_iteration_specific_zone.nc \
+ test_namestore_api_zone_iteration_stop.nc \
+ test_namestore_api_monitoring.nc \
+ test_namestore_api_monitoring_existing.nc
 # test_namestore_api_zone_to_name
 endif
 
+# Declare .nc (NO-CONCURRENCY) as a test extension so that we can impart
+# sequential execution order for them
+TEST_EXTENSIONS = .nc
+test_namestore_api_store.log: test_namestore_api_store_update.log
+test_namestore_api_store_update.log: test_namestore_api_lookup_public.log
+test_namestore_api_lookup_public.log: test_namestore_api_lookup_private.log
+test_namestore_api_lookup_private.log: test_namestore_api_lookup_nick.log
+test_namestore_api_lookup_nick.log: test_namestore_api_lookup_shadow.log
+test_namestore_api_lookup_shadow.log: 
test_namestore_api_lookup_shadow_filter.log
+test_namestore_api_lookup_shadow_filter.log: test_namestore_api_remove.log
+test_namestore_api_remove.log: 
test_namestore_api_remove_not_existing_record.log
+test_namestore_api_remove_not_existing_record.log: 
test_namestore_api_zone_iteration.log
+test_namestore_api_zone_iteration.log: 
test_namestore_api_zone_iteration_nick.log
+test_namestore_api_zone_iteration_nick.log: 
test_namestore_api_zone_iteration_specific_zone.log
+test_namestore_api_zone_iteration_specific_zone.log: 
test_namestore_api_zone_iteration_stop.log
+test_namestore_api_zone_iteration_stop.log: test_namestore_api_monitoring.log
+test_namestore_api_monitoring.log: test_namestore_api_monitoring_existing.log
+
+
 if HAVE_SQLITE
 check_PROGRAMS = \
  $(SQLITE_TESTS) \
@@ -202,79 +221,79 @@ libgnunet_plugin_rest_namestore_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
 
-test_namestore_api_store_SOURCES = \
+test_namestore_api_store_nc_SOURCES = \
  test_namestore_api_store.c
-test_namestore_api_store_LDADD = \
+test_namestore_api_store_nc_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   libgnunetnamestore.la
 
-test_namestore_api_store_update_SOURCES = \
+test_namestore_api_store_update_nc_SOURCES = \
  test_namestore_api_store_update.c
-test_namestore_api_store_update_LDADD = \
+test_namestore_api_store_update_nc_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
   libgnunetnamestore.la
 
-test_namestore_api_lookup_public_SOURCES = \
+test_namestore_api_lookup_public_nc_SOURCES = \
  test_namestore_api_lookup_public.c
-test_namestore_api_lookup_public_LDADD = \
+test_namestore_api_lookup_public_nc_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
   libgnunetnamestore.la
 
-test_namestore_api_lookup_nick_SOURCES = \
+test_namestore_api_lookup_nick_nc_SOURCES = \
  test_namestore_api_lookup_nick.c
-test_namestore_api_lookup_nick_LDADD = \
+test_namestore_api_lookup_nick_nc_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
   libgnunetnamestore.la
 
-test_namestore_api_lookup_private_SOURCES = \
+test_namestore_api_lookup_private_nc_SOURCES = \
  test_namestore_api_lookup_private.c
-test_namestore_api_lookup_private_LDADD = \
+test_namestore_api_lookup_private_nc_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
   libgnunetnamestore.la
 
-test_namestore_api_lookup_shadow_SOURCES = \
+test_namestore_api_lookup_shadow_nc_SOURCES = \
  test_namestore_api_lookup_shadow.c
-test_namestore_api_lookup_shadow_LDADD = \
+test_namestore_api_lookup_shadow_nc_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
   libgnunetnamestore.la
 
-test_namestore_api_lookup_shadow_filter_SOURCES = \
+test_namestore_api_lookup_shadow_filter_nc_SOURCES = \
  test_namestore_api_lookup_shadow_filter.c
-test_namestore_api_lookup_shadow_filter_LDADD = \
+test_namestore_api_lookup_shadow_filter_nc_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
   libgnunetnamestore.la
 
-test_namestore_api_remove_SOURCES = \
+test_namestore_api_remove_nc_SOURCES = \
  test_namestore_api_remove.c
-test_namestore_api_remove_LDADD = \
+test_namestore_api_remove_nc_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   libgnunetnamestore.la
 
-test_namestore_api_remove_not_existing_record_SOURCES = \
+test_namestore_api_remove_not_existing_record_nc_SOURCES = \
  test_namestore_api_remove_not_existing_record.c
-test_namestore_api_remove_not_existing_record_LDADD = \
+test_namestore_api_remove_not_existing_record_nc_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
@@ -287,50 +306,50 @@ test_namestore_api_remove_not_existing_record_LDADD = \
 #  $(top_builddir)/src/util/libgnunetutil.la \
 #  libgnunetnamestore.la
 
-test_namestore_api_monitoring_SOURCES = \
+test_namestore_api_monitoring_nc_SOURCES = \
  test_namestore_api_monitoring.c
-test_namestore_api_monitoring_LDADD = \
+test_namestore_api_monitoring_nc_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   libgnunetnamestore.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
-test_namestore_api_monitoring_existing_SOURCES = \
+test_namestore_api_monitoring_existing_nc_SOURCES = \
  test_namestore_api_monitoring_existing.c
-test_namestore_api_monitoring_existing_LDADD = \
+test_namestore_api_monitoring_existing_nc_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   libgnunetnamestore.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
-test_namestore_api_zone_iteration_SOURCES = \
+test_namestore_api_zone_iteration_nc_SOURCES = \
  test_namestore_api_zone_iteration.c
-test_namestore_api_zone_iteration_LDADD = \
+test_namestore_api_zone_iteration_nc_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   libgnunetnamestore.la
 
-test_namestore_api_zone_iteration_nick_SOURCES = \
+test_namestore_api_zone_iteration_nick_nc_SOURCES = \
  test_namestore_api_zone_iteration_nick.c
-test_namestore_api_zone_iteration_nick_LDADD = \
+test_namestore_api_zone_iteration_nick_nc_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   libgnunetnamestore.la
 
 
-test_namestore_api_zone_iteration_specific_zone_SOURCES = \
+test_namestore_api_zone_iteration_specific_zone_nc_SOURCES = \
  test_namestore_api_zone_iteration_specific_zone.c
-test_namestore_api_zone_iteration_specific_zone_LDADD = \
+test_namestore_api_zone_iteration_specific_zone_nc_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   libgnunetnamestore.la
 
-test_namestore_api_zone_iteration_stop_SOURCES = \
+test_namestore_api_zone_iteration_stop_nc_SOURCES = \
  test_namestore_api_zone_iteration_stop.c
-test_namestore_api_zone_iteration_stop_LDADD = \
+test_namestore_api_zone_iteration_stop_nc_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
@@ -363,7 +382,7 @@ EXTRA_DIST = \
   test_namestore_api.conf \
   test_plugin_namestore_sqlite.conf \
   test_plugin_namestore_postgres.conf \
-       test_plugin_namestore_flat.conf \
+  test_plugin_namestore_flat.conf \
   test_hostkey \
   zonefiles/S5I9DSGQVAB5FVV16T3B3CC5H1B2JGL3Q412JBKURME8EKU0600G.zkey \
   zonefiles/AQ835GVL939H4O8QJQ7GBLPTQC0QAAO91BN7QK01BA63MDSK6I4G.zkey \
diff --git a/src/namestore/test_namestore_api_remove.c 
b/src/namestore/test_namestore_api_remove.c
index c6c439e86..2d670c1ee 100644
--- a/src/namestore/test_namestore_api_remove.c
+++ b/src/namestore/test_namestore_api_remove.c
@@ -98,19 +98,22 @@ remove_cont (void *cls,
             int32_t success,
             const char *emsg)
 {
+  nsqe = NULL;
   if (GNUNET_YES != success)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-             _("Records could not be removed: `%s'\n"), emsg);
-    if (endbadly_task != NULL)
+                _("Records could not be removed: `%s'\n"),
+                emsg);
+    if (NULL != endbadly_task)
       GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task =  GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+    endbadly_task =  GNUNET_SCHEDULER_add_now (&endbadly,
+                                               NULL);
     return;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
              "Records were removed, perform lookup\n");
   removed = GNUNET_YES;
-  if (endbadly_task != NULL)
+  if (NULL != endbadly_task)
     GNUNET_SCHEDULER_cancel (endbadly_task);
   GNUNET_SCHEDULER_add_now (&end, NULL);
 }
@@ -139,8 +142,11 @@ put_cont (void *cls, int32_t success,
              "Name store added record for `%s': %s\n",
              name,
              (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
-  nsqe = GNUNET_NAMESTORE_records_store (nsh, privkey, name,
-                                        0, NULL, &remove_cont, (void *) name);
+  nsqe = GNUNET_NAMESTORE_records_store (nsh,
+                                         privkey,
+                                         name,
+                                        0, NULL,
+                                         &remove_cont, (void *) name);
 }
 
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] [gnunet] branch master updated (961e98d27 -> 0c7478479), gnunet <=
- [GNUnet-SVN] [gnunet] 01/03: enforce sequential test order (#4860), gnunet, 2017/02/21
- [GNUnet-SVN] [gnunet] 02/03: handle errors without crashing, gnunet, 2017/02/21
- [GNUnet-SVN] [gnunet] 03/03: update .ignore file, gnunet, 2017/02/21
Prev by Date: [GNUnet-SVN] [gnunet] 02/03: handle errors without crashing
Next by Date: [GNUnet-SVN] [gnunet] 03/03: update .ignore file
Previous by thread: [GNUnet-SVN] [libmicrohttpd] branch master updated: call_handlers(): always call idle_handler() after each read/write. This allow to process both read and write at single call_handlers() invocation if readability and writeability are both known (epoll mode). Simplified checks for 'fast track' mode.
Next by thread: [GNUnet-SVN] [gnunet] 01/03: enforce sequential test order (#4860)
Index(es):
- Date
- Thread