summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO15
-rw-r--r--src/fs/Makefile.am12
-rw-r--r--src/fs/perf_gnunet_service_fs_p2p_trust.c4
-rw-r--r--src/fs/test_gnunet_service_fs_p2p.c7
4 files changed, 14 insertions, 24 deletions
diff --git a/TODO b/TODO
index 90d38d66f..0fbe05e9a 100644
--- a/TODO
+++ b/TODO
@@ -1,17 +1,8 @@
0.9.0pre3:
* FS [CG]
- - perf_gnunet_service_fs_p2p_trust causes fs service to segfault
- - download of 100 MB file from 'leach' peer hung due to
- failure of core-api to call back after a change preference request
- (structs indicate request was transmitted but reply never received?)
- => try again!
- - test_gnunet_service_fs_p2p:
- => sometimes DATASTORE get operation fails to queue on target (why?)
- => do we need to just make the queue larger?
- - with core queue size of 1, we get notify_transmit_ready
- from core API returning NULL (why? ok? just have larger queue?)
- - other runs (-L DEBUG) with downloads using the new 'trust' test show
- non-deterministic results (for any set of peers)
+ - perf_gnunet_service_fs_p2p_trust causes crashes of the service
+ and assertion failures
+ - test_gnunet_fs_ns.py doesn't run
- implement 'SUPPORT_DELAYS'
0.9.0:
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index f6aaeb209..0d8da5412 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -192,13 +192,13 @@ TESTS = \
test_fs_unindex_persistence \
test_fs_uri \
test_fs_test_lib \
- test_gnunet_service_fs_migration
+ test_gnunet_service_fs_migration \
+ test_gnunet_service_fs_p2p \
+ perf_gnunet_service_fs_p2p \
+ perf_gnunet_service_fs_p2p_index \
+ $(check_SCRIPTS)
endif
-# test_gnunet_service_fs_p2p \
-# perf_gnunet_service_fs_p2p \
-# perf_gnunet_service_fs_p2p_index \
-# $(check_SCRIPTS)
-#endif
+# perf_gnunet_service_fs_p2p_trust \
diff --git a/src/fs/perf_gnunet_service_fs_p2p_trust.c b/src/fs/perf_gnunet_service_fs_p2p_trust.c
index 6611f143b..c15d5ebdb 100644
--- a/src/fs/perf_gnunet_service_fs_p2p_trust.c
+++ b/src/fs/perf_gnunet_service_fs_p2p_trust.c
@@ -460,7 +460,7 @@ main (int argc, char *argv[])
};
progname = argv[0];
GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
- GNUNET_log_setup ("perf_gnunet_service_fs_p2p_index",
+ GNUNET_log_setup ("perf_gnunet_service_fs_p2p_trust",
#if VERBOSE
"DEBUG",
#else
@@ -468,7 +468,7 @@ main (int argc, char *argv[])
#endif
NULL);
GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
- argvx, "perf-gnunet-service-fs-p2p-index",
+ argvx, "perf-gnunet-service-fs-p2p-trust",
"nohelp", options, &run, NULL);
GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
return ok;
diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c
index 4a7de8f2b..d21e700e5 100644
--- a/src/fs/test_gnunet_service_fs_p2p.c
+++ b/src/fs/test_gnunet_service_fs_p2p.c
@@ -26,18 +26,17 @@
#include "platform.h"
#include "fs_test_lib.h"
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
/**
* File-size we use for testing.
*/
-#define FILESIZE (1024 * 1024 * 200)
+#define FILESIZE (1024 * 1024 * 1)
/**
* How long until we give up on the download?
*/
-#define TIMEOUT GNUNET_TIME_UNIT_FOREVER_REL
-// GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
#define NUM_DAEMONS 2