From: Daniele Varrazzo Date: Fri, 7 Jan 2022 21:05:02 +0000 (+0100) Subject: Use info instead of pgconn in copy tests X-Git-Tag: pool-3.1~31 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e161324d26363146c5e3dd5e4b77c176838d42c;p=thirdparty%2Fpsycopg.git Use info instead of pgconn in copy tests It displays better information in case of assert failed. --- diff --git a/tests/test_copy.py b/tests/test_copy.py index 05448f4a2..f730e76bc 100644 --- a/tests/test_copy.py +++ b/tests/test_copy.py @@ -64,14 +64,14 @@ def test_copy_out_read(conn, format): got = copy.read() assert got == row assert ( - conn.pgconn.transaction_status == conn.TransactionStatus.ACTIVE + conn.info.transaction_status == conn.TransactionStatus.ACTIVE ) assert copy.read() == b"" assert copy.read() == b"" assert copy.read() == b"" - assert conn.pgconn.transaction_status == conn.TransactionStatus.INTRANS + assert conn.info.transaction_status == conn.TransactionStatus.INTRANS @pytest.mark.parametrize("format", Format) @@ -87,7 +87,7 @@ def test_copy_out_iter(conn, format): ) as copy: assert list(copy) == want - assert conn.pgconn.transaction_status == conn.TransactionStatus.INTRANS + assert conn.info.transaction_status == conn.TransactionStatus.INTRANS @pytest.mark.parametrize("format", Format) @@ -104,7 +104,7 @@ def test_read_rows(conn, format, typetype): assert copy.read_row() is None assert row == (10, "hello", [0.0, 1.0]) - assert conn.pgconn.transaction_status == conn.TransactionStatus.INTRANS + assert conn.info.transaction_status == conn.TransactionStatus.INTRANS @pytest.mark.parametrize("format", Format) @@ -117,7 +117,7 @@ def test_rows(conn, format): rows = list(copy.rows()) assert rows == sample_records - assert conn.pgconn.transaction_status == conn.TransactionStatus.INTRANS + assert conn.info.transaction_status == conn.TransactionStatus.INTRANS def test_set_custom_type(conn, hstore): @@ -225,7 +225,7 @@ def test_copy_in_buffers_pg_error(conn): with cur.copy("copy copy_in from stdin (format text)") as copy: copy.write(sample_text) copy.write(sample_text) - assert conn.pgconn.transaction_status == conn.TransactionStatus.INERROR + assert conn.info.transaction_status == conn.TransactionStatus.INERROR def test_copy_bad_result(conn): @@ -271,7 +271,7 @@ def test_copy_in_str_binary(conn): with cur.copy("copy copy_in from stdin (format binary)") as copy: copy.write(sample_text.decode()) - assert conn.pgconn.transaction_status == conn.TransactionStatus.INERROR + assert conn.info.transaction_status == conn.TransactionStatus.INERROR @pytest.mark.parametrize("format", Format) @@ -281,7 +281,7 @@ def test_copy_in_empty(conn, format): with cur.copy(f"copy copy_in from stdin (format {format.name})"): pass - assert conn.pgconn.transaction_status == conn.TransactionStatus.INTRANS + assert conn.info.transaction_status == conn.TransactionStatus.INTRANS assert cur.rowcount == 0 @@ -321,7 +321,7 @@ def test_copy_in_error_empty(conn, format): raise Exception("mannaggiamiseria") assert "mannaggiamiseria" in str(exc.value) - assert conn.pgconn.transaction_status == conn.TransactionStatus.INERROR + assert conn.info.transaction_status == conn.TransactionStatus.INERROR def test_copy_in_buffers_with_pg_error(conn): @@ -332,7 +332,7 @@ def test_copy_in_buffers_with_pg_error(conn): copy.write(sample_text) copy.write(sample_text) - assert conn.pgconn.transaction_status == conn.TransactionStatus.INERROR + assert conn.info.transaction_status == conn.TransactionStatus.INERROR def test_copy_in_buffers_with_py_error(conn): @@ -344,7 +344,7 @@ def test_copy_in_buffers_with_py_error(conn): raise Exception("nuttengoggenio") assert "nuttengoggenio" in str(exc.value) - assert conn.pgconn.transaction_status == conn.TransactionStatus.INERROR + assert conn.info.transaction_status == conn.TransactionStatus.INERROR @pytest.mark.parametrize("format", Format) diff --git a/tests/test_copy_async.py b/tests/test_copy_async.py index c136c0283..d03e0ef2b 100644 --- a/tests/test_copy_async.py +++ b/tests/test_copy_async.py @@ -39,15 +39,14 @@ async def test_copy_out_read(aconn, format): got = await copy.read() assert got == row assert ( - aconn.pgconn.transaction_status - == aconn.TransactionStatus.ACTIVE + aconn.info.transaction_status == aconn.TransactionStatus.ACTIVE ) assert await copy.read() == b"" assert await copy.read() == b"" assert await copy.read() == b"" - assert aconn.pgconn.transaction_status == aconn.TransactionStatus.INTRANS + assert aconn.info.transaction_status == aconn.TransactionStatus.INTRANS @pytest.mark.parametrize("format", Format) @@ -63,7 +62,7 @@ async def test_copy_out_iter(aconn, format): ) as copy: assert await alist(copy) == want - assert aconn.pgconn.transaction_status == aconn.TransactionStatus.INTRANS + assert aconn.info.transaction_status == aconn.TransactionStatus.INTRANS @pytest.mark.parametrize("format", Format) @@ -80,7 +79,7 @@ async def test_read_rows(aconn, format, typetype): assert (await copy.read_row()) is None assert row == (10, "hello", [0.0, 1.0]) - assert aconn.pgconn.transaction_status == aconn.TransactionStatus.INTRANS + assert aconn.info.transaction_status == aconn.TransactionStatus.INTRANS @pytest.mark.parametrize("format", Format) @@ -93,7 +92,7 @@ async def test_rows(aconn, format): rows = await alist(copy.rows()) assert rows == sample_records - assert aconn.pgconn.transaction_status == aconn.TransactionStatus.INTRANS + assert aconn.info.transaction_status == aconn.TransactionStatus.INTRANS async def test_set_custom_type(aconn, hstore): @@ -204,7 +203,7 @@ async def test_copy_in_buffers_pg_error(aconn): async with cur.copy("copy copy_in from stdin (format text)") as copy: await copy.write(sample_text) await copy.write(sample_text) - assert aconn.pgconn.transaction_status == aconn.TransactionStatus.INERROR + assert aconn.info.transaction_status == aconn.TransactionStatus.INERROR async def test_copy_bad_result(aconn): @@ -251,7 +250,7 @@ async def test_copy_in_str_binary(aconn): async with cur.copy("copy copy_in from stdin (format binary)") as copy: await copy.write(sample_text.decode()) - assert aconn.pgconn.transaction_status == aconn.TransactionStatus.INERROR + assert aconn.info.transaction_status == aconn.TransactionStatus.INERROR @pytest.mark.parametrize("format", Format) @@ -261,7 +260,7 @@ async def test_copy_in_empty(aconn, format): async with cur.copy(f"copy copy_in from stdin (format {format.name})"): pass - assert aconn.pgconn.transaction_status == aconn.TransactionStatus.INTRANS + assert aconn.info.transaction_status == aconn.TransactionStatus.INTRANS assert cur.rowcount == 0 @@ -302,7 +301,7 @@ async def test_copy_in_error_empty(aconn, format): raise Exception("mannaggiamiseria") assert "mannaggiamiseria" in str(exc.value) - assert aconn.pgconn.transaction_status == aconn.TransactionStatus.INERROR + assert aconn.info.transaction_status == aconn.TransactionStatus.INERROR async def test_copy_in_buffers_with_pg_error(aconn): @@ -313,7 +312,7 @@ async def test_copy_in_buffers_with_pg_error(aconn): await copy.write(sample_text) await copy.write(sample_text) - assert aconn.pgconn.transaction_status == aconn.TransactionStatus.INERROR + assert aconn.info.transaction_status == aconn.TransactionStatus.INERROR async def test_copy_in_buffers_with_py_error(aconn): @@ -325,7 +324,7 @@ async def test_copy_in_buffers_with_py_error(aconn): raise Exception("nuttengoggenio") assert "nuttengoggenio" in str(exc.value) - assert aconn.pgconn.transaction_status == aconn.TransactionStatus.INERROR + assert aconn.info.transaction_status == aconn.TransactionStatus.INERROR @pytest.mark.parametrize("format", Format)