From ea0cb087050dc86bae886c0b2605b83aa819b7d3 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sat, 4 Jan 2020 12:41:34 -0600 Subject: [PATCH] test-restore-map-owner: accommodate python 3 and test there Signed-off-by: Rob Browning --- Makefile | 4 ++-- t/test-restore-map-owner.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 32f0a51..3f709a5 100644 --- a/Makefile +++ b/Makefile @@ -192,6 +192,7 @@ cmdline_tests := \ t/test-packsizelimit \ t/test-prune-older \ t/test-redundant-saves.sh \ + t/test-restore-map-owner.sh \ t/test-restore-single-file.sh \ t/test-rm.sh \ t/test-rm-between-index-and-save.sh \ @@ -207,8 +208,7 @@ cmdline_tests := \ ifeq "2" "$(bup_python_majver)" cmdline_tests += \ - t/test-web.sh \ - t/test-restore-map-owner.sh + t/test-web.sh endif tmp-target-run-test-get-%: all t/tmp diff --git a/t/test-restore-map-owner.sh b/t/test-restore-map-owner.sh index bf9362e..84f3b08 100755 --- a/t/test-restore-map-owner.sh +++ b/t/test-restore-map-owner.sh @@ -87,10 +87,10 @@ import grp, pwd try: pwd.getpwuid(0) grp.getgrgid(0) - print 'yes' -except KeyError, ex: + print('yes') +except KeyError as ex: pass -" 2>/dev/null) || exit $? +") || exit $? if [ "$has_uid_gid_0" == yes ] then WVSTART "restore --map-user/group/uid/gid (zero uid/gid trumps all)" -- 2.39.2