File tests_fix.patch of Package saltbundlepy-cffi
--- a/testing/cffi0/backend_tests.py 2019-11-03 17:22:31.000000000 +0300
+++ b/testing/cffi0/backend_tests.py 2021-09-14 12:53:59.585678150 +0300
@@ -1241,7 +1241,7 @@
py.test.skip(str(e))
f.write(ffi.buffer(a, 1000 * ffi.sizeof("int")))
f.seek(0)
- assert f.read() == array.array('i', range(1000)).tostring()
+ assert f.read() == array.array('i', range(1000)).tobytes()
f.seek(0)
b = ffi.new("int[]", 1005)
f.readinto(ffi.buffer(b, 1000 * ffi.sizeof("int")))
@@ -1260,7 +1260,7 @@
py.test.skip(str(e))
f.write(ffi.buffer(a, 1000 * ffi.sizeof("int")))
f.seek(0)
- assert f.read() == array.array('i', range(1000)).tostring()
+ assert f.read() == array.array('i', range(1000)).tobytes()
f.seek(0)
b = ffi.new("int[]", 1005)
f.readinto(ffi.buffer(b, 1000 * ffi.sizeof("int")))
--- a/testing/cffi1/test_new_ffi_1.py 2019-11-03 17:22:31.000000000 +0300
+++ b/testing/cffi1/test_new_ffi_1.py 2021-09-14 12:54:12.429816864 +0300
@@ -1220,7 +1220,7 @@
py.test.skip(str(e))
f.write(ffi.buffer(a, 1000 * ffi.sizeof("int")))
f.seek(0)
- assert f.read() == array.array('i', range(1000)).tostring()
+ assert f.read() == array.array('i', range(1000)).tobytes()
f.seek(0)
b = ffi.new("int[]", 1005)
f.readinto(ffi.buffer(b, 1000 * ffi.sizeof("int")))
@@ -1238,7 +1238,7 @@
py.test.skip(str(e))
f.write(ffi.buffer(a, 1000 * ffi.sizeof("int")))
f.seek(0)
- assert f.read() == array.array('i', range(1000)).tostring()
+ assert f.read() == array.array('i', range(1000)).tobytes()
f.seek(0)
b = ffi.new("int[]", 1005)
f.readinto(ffi.buffer(b, 1000 * ffi.sizeof("int")))
--- a/testing/cffi1/test_recompiler.py 2019-11-03 17:22:31.000000000 +0300
+++ b/testing/cffi1/test_recompiler.py 2021-09-14 12:37:38.083667171 +0300
@@ -881,10 +881,10 @@
e5 = py.test.raises(TypeError, lib.foo2)
e6 = py.test.raises(TypeError, lib.foo2, 42)
e7 = py.test.raises(TypeError, lib.foo2, 45, 46, 47)
- assert str(e1.value) == "foo0() takes no arguments (1 given)"
- assert str(e2.value) == "foo0() takes no arguments (2 given)"
- assert str(e3.value) == "foo1() takes exactly one argument (0 given)"
- assert str(e4.value) == "foo1() takes exactly one argument (2 given)"
+ assert str(e1.value).endswith("foo0() takes no arguments (1 given)")
+ assert str(e2.value).endswith("foo0() takes no arguments (2 given)")
+ assert str(e3.value).endswith("foo1() takes exactly one argument (0 given)")
+ assert str(e4.value).endswith("foo1() takes exactly one argument (2 given)")
assert str(e5.value) in ["foo2 expected 2 arguments, got 0",
"foo2() takes exactly 2 arguments (0 given)"]
assert str(e6.value) in ["foo2 expected 2 arguments, got 1",