summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2022-02-11 11:46:42 +0100
committerChristian Grothoff <christian@grothoff.org>2022-02-11 11:46:42 +0100
commit3b9d67a6f8a501bed0a24354bdba1b97a77d1320 (patch)
treea4f336bbfbc5c53907ff9918e8df3f9c48c99c9e
parent0995bdd1d05356ed5f97954449f5a5c74a41bdc5 (diff)
downloadexchange-3b9d67a6f8a501bed0a24354bdba1b97a77d1320.tar.gz
exchange-3b9d67a6f8a501bed0a24354bdba1b97a77d1320.tar.bz2
exchange-3b9d67a6f8a501bed0a24354bdba1b97a77d1320.zip
-get twisted tests to pass
-rw-r--r--src/testing/Makefile.am28
-rw-r--r--src/testing/test_exchange_api_twisted-rsa.conf (renamed from src/testing/test_exchange_api_twisted.conf)6
2 files changed, 30 insertions, 4 deletions
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 1704f3cb4..a6b582709 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -136,7 +136,8 @@ check_PROGRAMS = \
test_taler_exchange_wirewatch-postgres
if HAVE_TWISTER
check_PROGRAMS += \
- test_exchange_api_twisted \
+ test_exchange_api_twisted_cs \
+ test_exchange_api_twisted_rsa \
test_bank_api_with_fakebank_twisted \
test_bank_api_with_pybank_twisted
endif
@@ -413,9 +414,27 @@ test_taler_exchange_wirewatch_postgres_LDADD = \
-lpthread \
$(XLIB)
-test_exchange_api_twisted_SOURCES = \
+test_exchange_api_twisted_cs_SOURCES = \
test_exchange_api_twisted.c
-test_exchange_api_twisted_LDADD = \
+test_exchange_api_twisted_cs_LDADD = \
+ $(LIBGCRYPT_LIBS) \
+ libtalertesting.la \
+ libtalertwistertesting.la \
+ $(top_builddir)/src/lib/libtalerexchange.la \
+ $(top_builddir)/src/bank-lib/libtalerfakebank.la \
+ $(top_builddir)/src/bank-lib/libtalerbank.la \
+ $(top_builddir)/src/json/libtalerjson.la \
+ $(top_builddir)/src/util/libtalerutil.la \
+ -lgnunettesting \
+ -lgnunetjson \
+ -lgnunetcurl \
+ -lgnunetutil \
+ -ljansson \
+ $(XLIB)
+
+test_exchange_api_twisted_rsa_SOURCES = \
+ test_exchange_api_twisted.c
+test_exchange_api_twisted_rsa_LDADD = \
$(LIBGCRYPT_LIBS) \
libtalertesting.la \
libtalertwistertesting.la \
@@ -500,7 +519,8 @@ EXTRA_DIST = \
test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee \
test_exchange_api-cs.conf \
test_exchange_api-rsa.conf \
- test_exchange_api_twisted.conf \
+ test_exchange_api_twisted-cs.conf \
+ test_exchange_api_twisted-rsa.conf \
test_exchange_api_keys_cherry_picking-cs.conf \
test_exchange_api_keys_cherry_picking-rsa.conf \
test_exchange_api_expire_reserve_now-cs.conf \
diff --git a/src/testing/test_exchange_api_twisted.conf b/src/testing/test_exchange_api_twisted-rsa.conf
index a41cfd43c..077d49c16 100644
--- a/src/testing/test_exchange_api_twisted.conf
+++ b/src/testing/test_exchange_api_twisted-rsa.conf
@@ -104,6 +104,8 @@ fee_deposit = EUR:0.00
fee_refresh = EUR:0.01
fee_refund = EUR:0.01
rsa_keysize = 1024
+CIPHER = RSA
+
[coin_eur_ct_10]
value = EUR:0.10
@@ -115,6 +117,7 @@ fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
rsa_keysize = 1024
+CIPHER = RSA
[coin_eur_1]
value = EUR:1
@@ -126,6 +129,7 @@ fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
rsa_keysize = 1024
+CIPHER = RSA
[coin_eur_5]
value = EUR:5
@@ -137,6 +141,7 @@ fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
rsa_keysize = 1024
+CIPHER = RSA
[coin_eur_10]
value = EUR:10
@@ -148,3 +153,4 @@ fee_deposit = EUR:0.01
fee_refresh = EUR:0.03
fee_refund = EUR:0.01
rsa_keysize = 1024
+CIPHER = RSA