From ebd2cf0e07c0dca2cc81282e8d7d1eb2a9dcffb0 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 19 Jun 2012 08:02:47 +0000
Subject: [PATCH] -use testing to create hostkey during peerinfo tool test

---
 src/peerinfo-tool/test_gnunet_peerinfo.py.in | 10 ++++++++--
 src/testing/gnunet-testing.c                 |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/peerinfo-tool/test_gnunet_peerinfo.py.in b/src/peerinfo-tool/test_gnunet_peerinfo.py.in
index bff673e3b..81acb3c8b 100755
--- a/src/peerinfo-tool/test_gnunet_peerinfo.py.in
+++ b/src/peerinfo-tool/test_gnunet_peerinfo.py.in
@@ -35,21 +35,27 @@ from gnunet_pyexpect import pexpect
 if os.name == 'posix':
   peerinfo = 'gnunet-peerinfo'
   gnunetarm = 'gnunet-arm'
+  gnunettesting = 'gnunet-testing'
 elif os.name == 'nt':
   peerinfo = 'gnunet-peerinfo.exe'
   gnunetarm = 'gnunet-arm.exe'
-
-
+  gnunettesting = 'gnunet-testing.exe'
 
 pinfo = pexpect ()
 pinfo.spawn (None, [peerinfo, '-i', '-c', 'test_gnunet_peerinfo_data.conf', '-L', 'ERROR'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
 pinfo.expect ("stdout", re.compile (r'Error in communication with PEERINFO service: Timeout transmitting iteration request to `PEERINFO\' service.\r?\n'))
 pinfo.expect ("stdout", "EOF")
 
+
 if os.name == "nt":
   shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-peerinfo"), True)
 else:
   shutil.rmtree ("/tmp/gnunet-test-peerinfo", True)
+
+# create hostkey via testing lib
+hkk = subprocess.Popen ([gnunettesting, '-n 1', '-k', '/tmp/gnunet-test-peerinfo/.hostkey'])
+hkk.communicate ()
+
 arm = subprocess.Popen ([gnunetarm, '-sq', '-c', 'test_gnunet_peerinfo_data.conf'])
 arm.communicate ()
 
diff --git a/src/testing/gnunet-testing.c b/src/testing/gnunet-testing.c
index bce0c7522..fa7e8d61e 100644
--- a/src/testing/gnunet-testing.c
+++ b/src/testing/gnunet-testing.c
@@ -131,6 +131,7 @@ create_hostkeys (const unsigned int no)
     fprintf (stderr, _("Could not extract hostkey %u (offset too large?)\n"), create_no);
     return 1;
   }
+  (void) GNUNET_DISK_directory_create_for_file (create_hostkey);
   fd = GNUNET_DISK_file_open (create_hostkey,
 			      GNUNET_DISK_OPEN_READWRITE |
 			      GNUNET_DISK_OPEN_CREATE,
-- 
2.25.1