From 6d8ba0321cde6cf5dd240b9cbcf36dc95bfdc798 Mon Sep 17 00:00:00 2001
From: "Schanzenbach, Martin" <mschanzenbach@posteo.de>
Date: Sun, 22 Dec 2019 12:41:26 +0900
Subject: [PATCH] rename test as it is now communicator-independent

---
 src/transport/Makefile.am                                  | 6 +++---
 .../{test_communicator_unix.c => test_communicator.c}      | 7 ++++---
 ...mmunicator_1.conf => test_communicator_unix_peer1.conf} | 5 ++++-
 ...mmunicator_2.conf => test_communicator_unix_peer2.conf} | 4 ++++
 4 files changed, 15 insertions(+), 7 deletions(-)
 rename src/transport/{test_communicator_unix.c => test_communicator.c} (98%)
 rename src/transport/{test_communicator_1.conf => test_communicator_unix_peer1.conf} (73%)
 rename src/transport/{test_communicator_2.conf => test_communicator_unix_peer2.conf} (85%)

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index a5b9aaaa8..ff9d7aec7 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -783,7 +783,7 @@ test_plugin_udp_LDADD = \
 endif
 
 test_communicator_unix_SOURCES = \
- test_communicator_unix.c
+ test_communicator.c
 test_communicator_unix_LDADD = \
  libgnunettransporttesting2.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
@@ -1486,5 +1486,5 @@ test_transport_api_slow_ats_peer2.conf \
   tcp_server_mst_legacy.c \
   tcp_server_legacy.c \
   tcp_service_legacy.c \
-test_communicator_1.conf \
-test_communicator_1.conf
+test_communicator_unix_peer1.conf \
+test_communicator_unix_peer2.conf
diff --git a/src/transport/test_communicator_unix.c b/src/transport/test_communicator.c
similarity index 98%
rename from src/transport/test_communicator_unix.c
rename to src/transport/test_communicator.c
index 83ab1ea26..34be5d66a 100644
--- a/src/transport/test_communicator_unix.c
+++ b/src/transport/test_communicator.c
@@ -19,9 +19,10 @@
 */
 
 /**
-* @file transport/test_communicator_unix.c
-* @brief test the unix communicator
+* @file transport/test_communicator.c
+* @brief test the communicators
 * @author Julius Bünger
+* @author Martin Schanzenbach
 */
 #include "platform.h"
 #include "gnunet_util_lib.h"
@@ -35,7 +36,7 @@
 
 
 #define LOG(kind, ...) GNUNET_log_from (kind, \
-                                        "test_transport_communicator_unix", \
+                                        "test_transport_communicator", \
                                         __VA_ARGS__)
 
 #define NUM_PEERS 2
diff --git a/src/transport/test_communicator_1.conf b/src/transport/test_communicator_unix_peer1.conf
similarity index 73%
rename from src/transport/test_communicator_1.conf
rename to src/transport/test_communicator_unix_peer1.conf
index af221e1d3..f0d5ac299 100644
--- a/src/transport/test_communicator_1.conf
+++ b/src/transport/test_communicator_unix_peer1.conf
@@ -1,7 +1,10 @@
 @INLINE@ test_transport_defaults.conf
 
 [PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-communicator-unix-1/
+
+[PEER]
+PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-1/private.key
 
 [transport-tcp]
 PORT = 52400
diff --git a/src/transport/test_communicator_2.conf b/src/transport/test_communicator_unix_peer2.conf
similarity index 85%
rename from src/transport/test_communicator_2.conf
rename to src/transport/test_communicator_unix_peer2.conf
index 46a132648..1897f4039 100644
--- a/src/transport/test_communicator_2.conf
+++ b/src/transport/test_communicator_unix_peer2.conf
@@ -3,6 +3,10 @@
 [PATHS]
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/
 
+[PEER]
+PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-2/private.key
+
+
 [transport-tcp]
 PORT = 52400
 
-- 
2.25.1