[libeufin] branch master updated (f324a2d -> 66efdb4)

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a change to branch master
in repository libeufin.

    from f324a2d  formatting / headers
     new dfe6716  upgrade gradle
     new 66efdb4  reliable test shutdown

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gradle/wrapper/gradle-wrapper.jar        | Bin 55190 -> 55616 bytes
 gradle/wrapper/gradle-wrapper.properties |   5 ++---
 gradlew                                  |  22 +++++++++++++++++++---
 gradlew.bat                              |  18 +++++++++++++++++-
 integration-tests/util.py                |  13 ++++++++++---
 5 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar 
b/gradle/wrapper/gradle-wrapper.jar
index 87b738c..5c2d1cf 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and 
b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties 
b/gradle/wrapper/gradle-wrapper.properties
index eaa2cf0..622ab64 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Nov 01 10:46:40 CET 2019
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index af6708f..83f2acf 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to 
pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" 
\"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
diff --git a/gradlew.bat b/gradlew.bat
index 0f8d593..24467a1 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS 
to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
diff --git a/integration-tests/util.py b/integration-tests/util.py
index cdef69f..cbae221 100644
--- a/integration-tests/util.py
+++ b/integration-tests/util.py
@@ -1,6 +1,6 @@
 # Helpers for the integration tests.
 
-from subprocess import check_call, Popen, PIPE
+from subprocess import check_call, Popen, PIPE, DEVNULL
 import socket
 from requests import post, get
 from time import sleep
@@ -17,6 +17,11 @@ def checkPort(port):
         print(f"Port {port} is not available")
         exit(77)
 
+def kill(name, s):
+    print(f"terminating {name} ...")
+    s.terminate()
+    print("terminated!")
+
 
 def startSandbox(dbname="sandbox-test.sqlite3"):
     db_full_path = str(Path.cwd() / dbname)
@@ -25,10 +30,11 @@ def startSandbox(dbname="sandbox-test.sqlite3"):
     checkPort(5000)
     sandbox = Popen(
         ["../gradlew", "-p", "..", "sandbox:run", "--console=plain", 
"--args=serve --db-name={}".format(db_full_path)],
+        stdin=DEVNULL,
         stdout=open("sandbox-stdout.log", "w"),
         stderr=open("sandbox-stderr.log", "w"),
     )
-    atexit.register(lambda: sandbox.terminate())
+    atexit.register(lambda: kill("sandbox", sandbox))
     for i in range(10):
         try:
             get("http://localhost:5000/";)
@@ -69,10 +75,11 @@ def startNexus(dbname="nexus-test.sqlite3"):
             "--console=plain",
             "--args=serve --db-name={}".format(db_full_path),
         ],
+        stdin=DEVNULL,
         stdout=open("nexus-stdout.log", "w"),
         stderr=open("nexus-stderr.log", "w"),
     )
-    atexit.register(lambda: nexus.terminate())
+    atexit.register(lambda: kill("nexus", nexus))
     for i in range(10):
         try:
             get("http://localhost:5001/";)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.