Merge pull request #780 from bareos/dev/joergs/master/remove-regress

Remove old regress tests

CHANGELOG.md

@@ -35,6 +35,8 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
 - fix drive parameter handling on big endian architectures [PR #850]
 
 ### Added
+- Add systemtests fileset-multiple-include-blocks, fileset-multiple-options-blocks, quota-softquota, sparse-file, truncate-command and block-size, (migrated from ``regress/``) [PR #780]
+- Add bvfs and dbcheck tests to python-bareos systemtest [PR #780]
 - systemtests for NDMP functionalities [PR #822]
 - added choice for the drive number in the truncate command [PR #823]
 - systemtests for S3 functionalities (droplet, libcloud) now use https [PR #765]
@@ -48,6 +50,8 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
 
 ### Changed
 - core: systemd service: change daemon type from forking to simple and start daemons in foreground [PR #824]
+- systemtests: define variable BackupDirectory globally [PR #780]
+- systemtests: run all systemstests with ``set -o pipefail`` [PR #780]
 - core: cleanup systemd service dependencies: Requires network.target, but start after the network-online.target [PR #700]
 - core: Make the jansson library mandatory when compiling the Bareos Director [PR #793]
 - core: Make the jansson library mandatory when compiling the Bareos Director [PR #793]
@@ -75,6 +79,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
 ### Deprecated
 
 ### Removed
+- Remove regression tests (``regress/`` directory). Tests still relevant tests have been migrated into systemtests [PR #780]
 - Removed outdated configuration files (example files).
 - Removed package **bareos-devel**.
 - Removed package **bareos-regress** and **bareos-regress-config**. The package **bareos-regress** has not been build for a long time.

core/.gitignore

@@ -36,7 +36,6 @@ platforms/univention/conffiles/etc/apt/sources.list.d/60_bareos.list
 scripts/bareos-config
 scripts/bareos-explorer
 scripts/bareos-glusterfind-wrapper
-scripts/bareos-regress.conf
 scripts/bareos
 scripts/bconsole
 scripts/disk-changer

core/scripts/bareos-ctl-dir.in

@@ -55,7 +55,7 @@ case "$1" in
 
     stop)
         if [ -x "${BAREOS_DIRECTOR_BINARY}" ]; then
-            echo -n "Stopping the Bareos Director daemon: "
+            printf "Stopping the Bareos Director daemon: "
             killproc "${BAREOS_DIRECTOR_BINARY}" "${BAREOS_DIRECTOR_PORT}"
         fi
         ;;

core/scripts/bareos-ctl-fd.in

@@ -54,7 +54,7 @@ case "$1" in
 
     stop)
         if [ -x ${BAREOS_FILEDAEMON_BINARY} ]; then
-            echo -n "Stopping the Bareos File daemon: "
+            printf "Stopping the Bareos File daemon: "
             killproc ${BAREOS_FILEDAEMON_BINARY} ${BAREOS_FD_PORT}
         fi
         ;;

core/scripts/bareos-ctl-funcs

@@ -49,14 +49,25 @@ checkPid()
 {
     pid="$1"
     wait="${2:-0}"
+    waittext="${3:-}"
+    output=""
 
     if [ -z "$pid" ]; then
         return 1
     fi
-    while [ $wait -gt 0 ] && ${PS} -p "$pid" >/dev/null 2>&1; do
-        sleep 1
-        wait=$(expr $wait - 1)
+
+    start=$(date +%s)
+    end=$(expr $start + $wait)
+
+    while [ "$(date +%s)" -lt "$end" ] && ${PS} -p "$pid" >/dev/null 2>&1; do
+        if [ "${waittext}" ]; then
+            printf "%s" "$waittext"
+            output="yes"
+        fi
+        # not all systems offer floating point numbers as sleep parameter, therefore try both.
+        sleep 0.1 || sleep 1
     done
+    if [ "${output}" ]; then printf " "; fi
     ${PS} -p "$pid" >/dev/null 2>&1
     return $?
 }
@@ -90,10 +101,10 @@ killproc() {
       if [ "$notset" = "1" ] ; then
          # TERM first, then KILL if not dead
          kill -TERM $pid 2>/dev/null
-         if checkPid "$pid" 1; then
+         if checkPid "$pid" 3 "."; then
             kill -KILL $pid 2>/dev/null
          fi
-         if checkPid "$pid" 1; then
+         if checkPid "$pid" 3 "_"; then
             failure
          else
             success

core/scripts/bareos-ctl-sd.in

@@ -53,7 +53,7 @@ case "$1" in
 
     stop)
         if [ -x ${BAREOS_STORAGEDAEMON_BINARY} ]; then
-            echo -n "Stopping the Bareos Storage daemon: "
+            printf "Stopping the Bareos Storage daemon: "
             killproc ${BAREOS_STORAGEDAEMON_BINARY} ${BAREOS_SD_PORT}
         fi
         ;;

core/src/dird/ua_status.cc

@@ -929,7 +929,7 @@ static void ListRunningJobs(UaContext* ua)
   endeach_jcr(jcr);
 
   if (njobs == 0) {
-    /* Note the following message is used in regress -- don't change */
+    // Note the following message is used by external programs -- don't change
     if (!ua->api) ua->SendMsg(_("No Jobs running.\n====\n"));
     Dmsg0(200, "leave list_run_jobs()\n");
     return;

docs/manuals/source/DeveloperGuide/BuildAndTestBareos.rst

@@ -5,4 +5,3 @@ Build And Test Bareos
 
    BuildAndTestBareos/documentation.rst
    BuildAndTestBareos/systemtests.rst
-   BuildAndTestBareos/regression.rst