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 1651d30db389993baf0d6b5abe316ca5727fec18..27885dcd282d05d1849f3bc06f3a0c2d2a33f86a 100644 (file)
--- 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-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
   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 \
 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 \
     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-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 \
     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 5c5b01ee5947659b3d687ee11792374ced57371d..4d67341e5330c7e725ebb50915a7128a5e54c173 100644 (file)
--- 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 \
     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 $?
 }
 
         || return $?
 }