From bfebdae8380456dd0392cd13b919d43d8e8f48be Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Fri, 30 Jul 2021 18:37:54 +0200
Subject: fix secmod helper config, wait for client directory

---
 src/util/test_helper_eddsa.c    | 18 +++++++++++++++---
 src/util/test_helper_eddsa.conf |  2 --
 src/util/test_helper_rsa.c      | 17 ++++++++++++++---
 src/util/test_helper_rsa.conf   |  2 --
 4 files changed, 29 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/util/test_helper_eddsa.c b/src/util/test_helper_eddsa.c
index aac855854..4b44f6041 100644
--- a/src/util/test_helper_eddsa.c
+++ b/src/util/test_helper_eddsa.c
@@ -332,15 +332,27 @@ run_test (void)
     GNUNET_break (0);
     return 77;
   }
-  esh = TALER_CRYPTO_helper_esign_connect (cfg,
-                                           &key_cb,
-                                           NULL);
+
+  /* wait for helper to start and give us keys */
+  fprintf (stderr, "Waiting for helper client directory to become available ");
+  for (unsigned int i = 0; i<1000; i++)
+  {
+    esh = TALER_CRYPTO_helper_esign_connect (cfg,
+                                             &key_cb,
+                                             NULL);
+    if (NULL != esh)
+      break;
+    nanosleep (&req, NULL);
+    fprintf (stderr, ".");
+  }
   GNUNET_CONFIGURATION_destroy (cfg);
   if (NULL == esh)
   {
     GNUNET_break (0);
     return 1;
   }
+  fprintf (stderr, " done.\n");
+
   /* wait for helper to start and give us keys */
   fprintf (stderr, "Waiting for helper to start ");
   for (unsigned int i = 0; i<1000; i++)
diff --git a/src/util/test_helper_eddsa.conf b/src/util/test_helper_eddsa.conf
index 541a8b144..321fa7cc3 100644
--- a/src/util/test_helper_eddsa.conf
+++ b/src/util/test_helper_eddsa.conf
@@ -7,5 +7,3 @@ TALER_RUNTIME_DIR = ${TMPDIR:-/tmp}/${USER}/test_helper_eddsa/
 LOOKAHEAD_SIGN = 5 minutes
 OVERLAP_DURATION = 1 s
 DURATION = 1 minute
-KEY_DIR = ${TALER_RUNTIME_DIR}keydir/
-UNIXPATH = ${TALER_RUNTIME_DIR}helper.unix
diff --git a/src/util/test_helper_rsa.c b/src/util/test_helper_rsa.c
index 96b88c345..4a9fa9058 100644
--- a/src/util/test_helper_rsa.c
+++ b/src/util/test_helper_rsa.c
@@ -471,15 +471,26 @@ run_test (void)
     GNUNET_break (0);
     return 77;
   }
-  dh = TALER_CRYPTO_helper_denom_connect (cfg,
-                                          &key_cb,
-                                          NULL);
+
+  fprintf (stderr, "Waiting for helper client directory to become available ");
+  for (unsigned int i = 0; i<1000; i++)
+  {
+    dh = TALER_CRYPTO_helper_denom_connect (cfg,
+                                            &key_cb,
+                                            NULL);
+    if (NULL != dh)
+      break;
+    nanosleep (&req, NULL);
+    fprintf (stderr, ".");
+  }
   GNUNET_CONFIGURATION_destroy (cfg);
   if (NULL == dh)
   {
     GNUNET_break (0);
     return 1;
   }
+  fprintf (stderr, " done.\n");
+
   /* wait for helper to start and give us keys */
   fprintf (stderr, "Waiting for helper to start ");
   for (unsigned int i = 0; i<1000; i++)
diff --git a/src/util/test_helper_rsa.conf b/src/util/test_helper_rsa.conf
index 524e4635d..66127ee01 100644
--- a/src/util/test_helper_rsa.conf
+++ b/src/util/test_helper_rsa.conf
@@ -11,5 +11,3 @@ RSA_KEYSIZE = 2048
 [taler-exchange-secmod-rsa]
 LOOKAHEAD_SIGN = 5 minutes
 OVERLAP_DURATION = 1 s
-KEY_DIR = ${TALER_RUNTIME_DIR}/keydir/
-UNIXPATH = ${TALER_RUNTIME_DIR}helper.unix
-- 
cgit v1.2.3