From d70973030d0c98d8024d206dc6430887dbfd5828 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Wed, 9 Oct 2019 01:17:06 -0500 Subject: [PATCH] thelpers: adjust for python 3 Signed-off-by: Rob Browning --- Makefile | 1 + lib/bup/t/thelpers.py | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index a44f733..f4d999b 100644 --- a/Makefile +++ b/Makefile @@ -160,6 +160,7 @@ ifeq "2" "$(bup_python_majver)" lib/bup/t/txstat.py else python_tests := \ + lib/bup/t/thashsplit.py \ lib/bup/t/toptions.py \ lib/bup/t/tshquote.py \ lib/bup/t/tvint.py diff --git a/lib/bup/t/thelpers.py b/lib/bup/t/thelpers.py index e0ef21f..d9f4704 100644 --- a/lib/bup/t/thelpers.py +++ b/lib/bup/t/thelpers.py @@ -103,7 +103,7 @@ def test_grafted_path_components(): def test_readpipe(): with no_lingering_errors(): x = readpipe(['echo', '42']) - WVPASSEQ(x, '42\n') + WVPASSEQ(x, b'42\n') try: readpipe(['bash', '-c', 'exit 42']) except Exception as ex: @@ -116,10 +116,10 @@ def test_batchpipe(): with no_lingering_errors(): for chunk in batchpipe(['echo'], []): WVPASS(False) - out = '' + out = b'' for chunk in batchpipe(['echo'], ['42']): out += chunk - WVPASSEQ(out, '42\n') + WVPASSEQ(out, b'42\n') try: batchpipe(['bash', '-c'], ['exit 42']) except Exception as ex: @@ -131,12 +131,12 @@ def test_batchpipe(): arg_max = \ helpers._argmax_base(['echo']) + helpers._argmax_args_size(args[:3]) batches = batchpipe(['echo'], args, arg_max=arg_max) - WVPASSEQ(next(batches), '0 1 2\n') - WVPASSEQ(next(batches), '3 4 5\n') + WVPASSEQ(next(batches), b'0 1 2\n') + WVPASSEQ(next(batches), b'3 4 5\n') WVPASSEQ(next(batches, None), None) batches = batchpipe(['echo'], [str(x) for x in range(5)], arg_max=arg_max) - WVPASSEQ(next(batches), '0 1 2\n') - WVPASSEQ(next(batches), '3 4\n') + WVPASSEQ(next(batches), b'0 1 2\n') + WVPASSEQ(next(batches), b'3 4\n') WVPASSEQ(next(batches, None), None) -- 2.39.2