diff options
author | Nathan S. Evans <evans@in.tum.de> | 2011-03-25 12:49:27 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2011-03-25 12:49:27 +0000 |
commit | c899b45a0864a41ba052d906a3f9f0ecaf07bf14 (patch) | |
tree | c939ce6d732d7a8b36bc8baba636779d9a591eb4 /src/testing | |
parent | d0b14419851f070e0e6d2ab646e6fc0f4baa08c8 (diff) | |
download | gnunet-c899b45a0864a41ba052d906a3f9f0ecaf07bf14.tar.gz gnunet-c899b45a0864a41ba052d906a3f9f0ecaf07bf14.zip |
change warning to debug, additional assertions for correctness and to make codesonar be quiet
Diffstat (limited to 'src/testing')
-rw-r--r-- | src/testing/testing_group.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c index 1a7b7cc6e..e7ae32f01 100644 --- a/src/testing/testing_group.c +++ b/src/testing/testing_group.c | |||
@@ -2815,6 +2815,7 @@ create_and_copy_friend_files(struct GNUNET_TESTING_PeerGroup *pg) | |||
2815 | GNUNET_asprintf (&arg, "%s/friends", temp_service_path); | 2815 | GNUNET_asprintf (&arg, "%s/friends", temp_service_path); |
2816 | procarr[pg_iter] = GNUNET_OS_start_process (NULL, NULL, "mv", "mv", | 2816 | procarr[pg_iter] = GNUNET_OS_start_process (NULL, NULL, "mv", "mv", |
2817 | mytemp, arg, NULL); | 2817 | mytemp, arg, NULL); |
2818 | GNUNET_assert(procarr[pg_iter] != NULL); | ||
2818 | #if VERBOSE_TESTING | 2819 | #if VERBOSE_TESTING |
2819 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2820 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2820 | _("Copying file with command cp %s %s\n"), mytemp, arg); | 2821 | _("Copying file with command cp %s %s\n"), mytemp, arg); |
@@ -2836,7 +2837,7 @@ create_and_copy_friend_files(struct GNUNET_TESTING_PeerGroup *pg) | |||
2836 | temp_service_path); | 2837 | temp_service_path); |
2837 | procarr[pg_iter] = GNUNET_OS_start_process (NULL, NULL, "scp", "scp", | 2838 | procarr[pg_iter] = GNUNET_OS_start_process (NULL, NULL, "scp", "scp", |
2838 | mytemp, arg, NULL); | 2839 | mytemp, arg, NULL); |
2839 | 2840 | GNUNET_assert(procarr[pg_iter] != NULL); | |
2840 | ret = GNUNET_OS_process_wait (procarr[pg_iter]); /* FIXME: schedule this, throttle! */ | 2841 | ret = GNUNET_OS_process_wait (procarr[pg_iter]); /* FIXME: schedule this, throttle! */ |
2841 | GNUNET_OS_process_close (procarr[pg_iter]); | 2842 | GNUNET_OS_process_close (procarr[pg_iter]); |
2842 | if (ret != GNUNET_OK) | 2843 | if (ret != GNUNET_OK) |
@@ -3034,7 +3035,7 @@ create_and_copy_blacklist_files(struct GNUNET_TESTING_PeerGroup *pg, | |||
3034 | temp_service_path); | 3035 | temp_service_path); |
3035 | procarr[pg_iter] = GNUNET_OS_start_process (NULL, NULL, "scp", "scp", | 3036 | procarr[pg_iter] = GNUNET_OS_start_process (NULL, NULL, "scp", "scp", |
3036 | mytemp, arg, NULL); | 3037 | mytemp, arg, NULL); |
3037 | 3038 | GNUNET_assert(procarr[pg_iter] != NULL); | |
3038 | GNUNET_OS_process_wait (procarr[pg_iter]); /* FIXME: add scheduled blacklist file copy that parallelizes file copying! */ | 3039 | GNUNET_OS_process_wait (procarr[pg_iter]); /* FIXME: add scheduled blacklist file copy that parallelizes file copying! */ |
3039 | 3040 | ||
3040 | #if VERBOSE_TESTING | 3041 | #if VERBOSE_TESTING |
@@ -5654,7 +5655,7 @@ start_peer_helper (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
5654 | /* FIXME: Doesn't support ssh_port option! */ | 5655 | /* FIXME: Doesn't support ssh_port option! */ |
5655 | helper->proc = GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh", arg, | 5656 | helper->proc = GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh", arg, |
5656 | "peerStartHelper.pl", tempdir, NULL); | 5657 | "peerStartHelper.pl", tempdir, NULL); |
5657 | 5658 | GNUNET_assert(helper->proc != NULL); | |
5658 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "starting peers with cmd ssh %s %s %s\n", arg, "peerStartHelper.pl", tempdir); | 5659 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "starting peers with cmd ssh %s %s %s\n", arg, "peerStartHelper.pl", tempdir); |
5659 | GNUNET_SCHEDULER_add_now (&check_peers_started, helper); | 5660 | GNUNET_SCHEDULER_add_now (&check_peers_started, helper); |
5660 | GNUNET_free (tempdir); | 5661 | GNUNET_free (tempdir); |
@@ -5875,6 +5876,7 @@ GNUNET_TESTING_daemons_start(const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
5875 | else | 5876 | else |
5876 | proc = GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh", arg, | 5877 | proc = GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh", arg, |
5877 | "mkdir -p", tmpdir, NULL); | 5878 | "mkdir -p", tmpdir, NULL); |
5879 | GNUNET_assert(proc != NULL); | ||
5878 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 5880 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
5879 | "Creating remote dir with command ssh %s %s %s\n", arg, | 5881 | "Creating remote dir with command ssh %s %s %s\n", arg, |
5880 | " mkdir -p ", tmpdir); | 5882 | " mkdir -p ", tmpdir); |
@@ -5907,7 +5909,7 @@ GNUNET_TESTING_daemons_start(const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
5907 | fs = 0; | 5909 | fs = 0; |
5908 | 5910 | ||
5909 | GNUNET_log ( | 5911 | GNUNET_log ( |
5910 | GNUNET_ERROR_TYPE_WARNING, | 5912 | GNUNET_ERROR_TYPE_DEBUG, |
5911 | "Found file size %llu for hostkeys, expect hostkeys to be size %d\n", | 5913 | "Found file size %llu for hostkeys, expect hostkeys to be size %d\n", |
5912 | fs, HOSTKEYFILESIZE); | 5914 | fs, HOSTKEYFILESIZE); |
5913 | 5915 | ||