From 3b9d67a6f8a501bed0a24354bdba1b97a77d1320 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 11 Feb 2022 11:46:42 +0100 Subject: -get twisted tests to pass --- src/testing/Makefile.am | 28 ++++- src/testing/test_exchange_api_twisted-rsa.conf | 156 +++++++++++++++++++++++++ src/testing/test_exchange_api_twisted.conf | 150 ------------------------ 3 files changed, 180 insertions(+), 154 deletions(-) create mode 100644 src/testing/test_exchange_api_twisted-rsa.conf delete mode 100644 src/testing/test_exchange_api_twisted.conf (limited to 'src') diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index 1704f3cb..a6b58270 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-rsa.conf b/src/testing/test_exchange_api_twisted-rsa.conf new file mode 100644 index 00000000..077d49c1 --- /dev/null +++ b/src/testing/test_exchange_api_twisted-rsa.conf @@ -0,0 +1,156 @@ +# This file is in the public domain. +[PATHS] +# Persistent data storage for the testcase +TALER_TEST_HOME = test_exchange_api_home/ +TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/${USER:-}/taler-system-runtime/ + +[taler-exchange-secmod-rsa] +# Reduce from 1 year to speed up test +LOOKAHEAD_SIGN = 24 days + +[taler-exchange-secmod-eddsa] +# Reduce from 1 year to speed up test +LOOKAHEAD_SIGN = 24 days +# Reduce from 12 weeks to ensure we have multiple +DURATION = 14 days + +[taler] +# Currency supported by the exchange (can only be one) +CURRENCY = EUR +CURRENCY_ROUND_UNIT = EUR:0.01 + +[exchange] +# HTTP port the exchange listens to +PORT = 8081 + +# Master public key used to sign the exchange's various keys +MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG + +# How to access our database +DB = postgres + +# Base URL of the exchange ('S PROXY). This URL is where the +# twister listens at, so that it will be able to get all the +# connection addressed to the exchange. In fact, the presence +# of the twister is 100% transparent to the test case, as it +# only seeks the exchange/BASE_URL URL to connect to the exchange. +BASE_URL = "http://localhost:8888/" + +[exchangedb-postgres] +CONFIG = "postgres:///talercheck" + +[auditor] +BASE_URL = "http://localhost:8083/" +PORT = 8083 + +[auditordb-postgres] +CONFIG = "postgres:///talercheck" + +[exchange-account-1] +# What is the URL of our account? +PAYTO_URI = "payto://x-taler-bank/localhost/42" + +[exchange-accountcredentials-1] +WIRE_GATEWAY_URL = "http://localhost:9081/42/" +WIRE_GATEWAY_AUTH_METHOD = NONE + +[exchange-account-2] +PAYTO_URI = payto://x-taler-bank/localhost/2 +ENABLE_DEBIT = YES +ENABLE_CREDIT = YES + +[exchange-accountcredentials-2] +WIRE_GATEWAY_URL = "http://localhost:8082/2/" +WIRE_GATEWAY_AUTH_METHOD = BASIC +USERNAME = user +PASSWORD = pass + +[bank] +HTTP_PORT = 8082 + +[twister] +# HTTP listen port for twister +HTTP_PORT = 8888 +SERVE = tcp + +# HTTP Destination for twister. The test-Webserver needs +# to listen on the port used here. Note: no trailing '/'! +DESTINATION_BASE_URL = "http://localhost:8081" + +# Control port for TCP +# PORT = 8889 +HOSTNAME = localhost +ACCEPT_FROM = 127.0.0.1; +ACCEPT_FROM6 = ::1; + +# Control port for UNIX +UNIXPATH = /tmp/taler-service-twister.sock +UNIX_MATCH_UID = NO +UNIX_MATCH_GID = YES + +# Launching of twister by ARM +# BINARY = taler-service-twister +# AUTOSTART = NO +# FORCESTART = NO + + +[coin_eur_ct_1] +value = EUR:0.01 +duration_withdraw = 7 days +duration_spend = 2 years +duration_legal = 3 years +fee_withdraw = EUR:0.00 +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 +duration_withdraw = 7 days +duration_spend = 2 years +duration_legal = 3 years +fee_withdraw = EUR:0.01 +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 +duration_withdraw = 7 days +duration_spend = 2 years +duration_legal = 3 years +fee_withdraw = EUR:0.01 +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 +duration_withdraw = 7 days +duration_spend = 2 years +duration_legal = 3 years +fee_withdraw = EUR:0.01 +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 +duration_withdraw = 7 days +duration_spend = 2 years +duration_legal = 3 years +fee_withdraw = EUR:0.01 +fee_deposit = EUR:0.01 +fee_refresh = EUR:0.03 +fee_refund = EUR:0.01 +rsa_keysize = 1024 +CIPHER = RSA diff --git a/src/testing/test_exchange_api_twisted.conf b/src/testing/test_exchange_api_twisted.conf deleted file mode 100644 index a41cfd43..00000000 --- a/src/testing/test_exchange_api_twisted.conf +++ /dev/null @@ -1,150 +0,0 @@ -# This file is in the public domain. -[PATHS] -# Persistent data storage for the testcase -TALER_TEST_HOME = test_exchange_api_home/ -TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/${USER:-}/taler-system-runtime/ - -[taler-exchange-secmod-rsa] -# Reduce from 1 year to speed up test -LOOKAHEAD_SIGN = 24 days - -[taler-exchange-secmod-eddsa] -# Reduce from 1 year to speed up test -LOOKAHEAD_SIGN = 24 days -# Reduce from 12 weeks to ensure we have multiple -DURATION = 14 days - -[taler] -# Currency supported by the exchange (can only be one) -CURRENCY = EUR -CURRENCY_ROUND_UNIT = EUR:0.01 - -[exchange] -# HTTP port the exchange listens to -PORT = 8081 - -# Master public key used to sign the exchange's various keys -MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG - -# How to access our database -DB = postgres - -# Base URL of the exchange ('S PROXY). This URL is where the -# twister listens at, so that it will be able to get all the -# connection addressed to the exchange. In fact, the presence -# of the twister is 100% transparent to the test case, as it -# only seeks the exchange/BASE_URL URL to connect to the exchange. -BASE_URL = "http://localhost:8888/" - -[exchangedb-postgres] -CONFIG = "postgres:///talercheck" - -[auditor] -BASE_URL = "http://localhost:8083/" -PORT = 8083 - -[auditordb-postgres] -CONFIG = "postgres:///talercheck" - -[exchange-account-1] -# What is the URL of our account? -PAYTO_URI = "payto://x-taler-bank/localhost/42" - -[exchange-accountcredentials-1] -WIRE_GATEWAY_URL = "http://localhost:9081/42/" -WIRE_GATEWAY_AUTH_METHOD = NONE - -[exchange-account-2] -PAYTO_URI = payto://x-taler-bank/localhost/2 -ENABLE_DEBIT = YES -ENABLE_CREDIT = YES - -[exchange-accountcredentials-2] -WIRE_GATEWAY_URL = "http://localhost:8082/2/" -WIRE_GATEWAY_AUTH_METHOD = BASIC -USERNAME = user -PASSWORD = pass - -[bank] -HTTP_PORT = 8082 - -[twister] -# HTTP listen port for twister -HTTP_PORT = 8888 -SERVE = tcp - -# HTTP Destination for twister. The test-Webserver needs -# to listen on the port used here. Note: no trailing '/'! -DESTINATION_BASE_URL = "http://localhost:8081" - -# Control port for TCP -# PORT = 8889 -HOSTNAME = localhost -ACCEPT_FROM = 127.0.0.1; -ACCEPT_FROM6 = ::1; - -# Control port for UNIX -UNIXPATH = /tmp/taler-service-twister.sock -UNIX_MATCH_UID = NO -UNIX_MATCH_GID = YES - -# Launching of twister by ARM -# BINARY = taler-service-twister -# AUTOSTART = NO -# FORCESTART = NO - - -[coin_eur_ct_1] -value = EUR:0.01 -duration_withdraw = 7 days -duration_spend = 2 years -duration_legal = 3 years -fee_withdraw = EUR:0.00 -fee_deposit = EUR:0.00 -fee_refresh = EUR:0.01 -fee_refund = EUR:0.01 -rsa_keysize = 1024 - -[coin_eur_ct_10] -value = EUR:0.10 -duration_withdraw = 7 days -duration_spend = 2 years -duration_legal = 3 years -fee_withdraw = EUR:0.01 -fee_deposit = EUR:0.01 -fee_refresh = EUR:0.03 -fee_refund = EUR:0.01 -rsa_keysize = 1024 - -[coin_eur_1] -value = EUR:1 -duration_withdraw = 7 days -duration_spend = 2 years -duration_legal = 3 years -fee_withdraw = EUR:0.01 -fee_deposit = EUR:0.01 -fee_refresh = EUR:0.03 -fee_refund = EUR:0.01 -rsa_keysize = 1024 - -[coin_eur_5] -value = EUR:5 -duration_withdraw = 7 days -duration_spend = 2 years -duration_legal = 3 years -fee_withdraw = EUR:0.01 -fee_deposit = EUR:0.01 -fee_refresh = EUR:0.03 -fee_refund = EUR:0.01 -rsa_keysize = 1024 - -[coin_eur_10] -value = EUR:10 -duration_withdraw = 7 days -duration_spend = 2 years -duration_legal = 3 years -fee_withdraw = EUR:0.01 -fee_deposit = EUR:0.01 -fee_refresh = EUR:0.03 -fee_refund = EUR:0.01 -rsa_keysize = 1024 -- cgit v1.2.3