From: Rob Browning <rlb@defaultvalue.org>
Date: Wed, 1 Jan 2020 21:04:30 +0000 (-0600)
Subject: Adjust resolve-parent for python 3 and enable test-save-*
X-Git-Tag: 0.31~133
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=bup.git;a=commitdiff_plain;h=afff80158b38b8f7171372a8d1e6e3d6065e89a9

Adjust resolve-parent for python 3 and enable test-save-*

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>
---

diff --git a/Makefile b/Makefile
index 1651d30..27885dc 100644
--- a/Makefile
+++ b/Makefile
@@ -185,6 +185,10 @@ cmdline_tests := \
   t/test-restore-single-file.sh \
   t/test-rm-between-index-and-save.sh \
   t/test-save-creates-no-unrefs.sh \
+  t/test-save-restore \
+  t/test-save-restore-excludes.sh \
+  t/test-save-strip-graft.sh \
+  t/test-save-with-valid-parent.sh \
   t/test-sparse-files.sh \
   t/test-split-join.sh \
   t/test-tz.sh
@@ -192,7 +196,6 @@ cmdline_tests := \
 ifeq "2" "$(bup_python_majver)"
   cmdline_tests += \
     t/test-ftp \
-    t/test-save-restore \
     t/test-prune-older \
     t/test-web.sh \
     t/test-rm.sh \
@@ -202,9 +205,6 @@ ifeq "2" "$(bup_python_majver)"
     t/test-index-check-device.sh \
     t/test-on.sh \
     t/test-restore-map-owner.sh \
-    t/test-save-with-valid-parent.sh \
-    t/test-save-restore-excludes.sh \
-    t/test-save-strip-graft.sh \
     t/test-import-duplicity.sh \
     t/test-import-rdiff-backup.sh \
     t/test-xdev.sh \
diff --git a/t/lib.sh b/t/lib.sh
index 5c5b01e..4d67341 100644
--- a/t/lib.sh
+++ b/t/lib.sh
@@ -17,7 +17,7 @@ resolve-parent()
     test "$#" -eq 1 || return $?
     echo "$1" | \
         PYTHONPATH="$bup_t_lib_script_home/../lib" bup-python -c \
-        "import sys, bup.helpers; print bup.helpers.resolve_parent(sys.stdin.readline())" \
+        "import sys, bup.helpers; print(bup.helpers.resolve_parent(sys.stdin.readline()))" \
         || return $?
 }