Commit 39b9225

Lorak-mmkdkropachev

authored and

committed

bytesio_testhelper: Remove assert_raises argument

1 parent 83671d8 commit 39b9225Copy full SHA for 39b9225

File tree

+10

-15

lines changed

+10

-15

lines changed

Lines changed: 6 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,32 +13,27 @@`
`13`	`13`	`# limitations under the License.`
`14`	`14`
`15`	`15`	`from cassandra.bytesio cimport BytesIOReader`
	`16`	`+import pytest`
`16`	`17`
`17`		`-def test_read1(assert_raises):`
	`18`	`+def test_read1():`
`18`	`19`	`cdef BytesIOReader reader = BytesIOReader(b'abcdef')`
`19`	`20`	`assert reader.read(2)[:2] == b'ab'`
`20`	`21`	`assert reader.read(2)[:2] == b'cd'`
`21`	`22`	`assert reader.read(0)[:0] == b''`
`22`	`23`	`assert reader.read(2)[:2] == b'ef'`
`23`	`24`
`24`		`-def test_read2(assert_raises):`
	`25`	`+def test_read2():`
`25`	`26`	`cdef BytesIOReader reader = BytesIOReader(b'abcdef')`
`26`	`27`	`reader.read(5)`
`27`	`28`	`reader.read(1)`
`28`	`29`
`29`		`-def test_read3(assert_raises):`
	`30`	`+def test_read3():`
`30`	`31`	`cdef BytesIOReader reader = BytesIOReader(b'abcdef')`
`31`	`32`	`reader.read(6)`
`32`	`33`
`33`		`-def test_read_eof(assert_raises):`
	`34`	`+def test_read_eof():`
`34`	`35`	`cdef BytesIOReader reader = BytesIOReader(b'abcdef')`
`35`	`36`	`reader.read(5)`
`36`		`- # cannot convert reader.read to an object, do it manually`
`37`		`- # assert_raises(EOFError, reader.read, 2)`
`38`		`- try:`
	`37`	`+ with pytest.raises(EOFError):`
`39`	`38`	`reader.read(2)`
`40`		`- except EOFError:`
`41`		`- pass`
`42`		`- else:`
`43`		`- raise Exception("Expected an EOFError")`
`44`	`39`	`reader.read(1) # see that we can still read this`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,10 @@ class BytesIOTest(unittest.TestCase):`
`23`	`23`
`24`	`24`	`@cythontest`
`25`	`25`	`def test_reading(self):`
`26`		`- bytesio_testhelper.test_read1(self.assertRaises)`
`27`		`- bytesio_testhelper.test_read2(self.assertRaises)`
`28`		`- bytesio_testhelper.test_read3(self.assertRaises)`
	`26`	`+ bytesio_testhelper.test_read1()`
	`27`	`+ bytesio_testhelper.test_read2()`
	`28`	`+ bytesio_testhelper.test_read3()`
`29`	`29`
`30`	`30`	`@cythontest`
`31`	`31`	`def test_reading_error(self):`
`32`		`- bytesio_testhelper.test_read_eof(self.assertRaises)`
	`32`	`+ bytesio_testhelper.test_read_eof()`

Comments

(0)