From d2bcdc00c6ecc01a6e8135e775ffdb87572b802b Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Thu, 17 Aug 2023 18:05:13 -0700 Subject: [PATCH] Swapped the order of a bunch of pytest comparisons When I wrote this I thought constant == value was a better assertion. I no longer think that. --- tests/test_cli.py | 18 +++++++-------- tests/test_cli_convert.py | 28 +++++++++++------------ tests/test_cli_insert.py | 48 +++++++++++++++++++-------------------- tests/test_create.py | 22 +++++++++--------- tests/test_delete.py | 8 +++---- tests/test_gis.py | 8 +++---- tests/test_introspect.py | 12 +++++----- tests/test_m2m.py | 6 ++--- tests/test_update.py | 4 ++-- tests/test_upsert.py | 10 ++++---- 10 files changed, 82 insertions(+), 82 deletions(-) diff --git a/tests/test_cli.py b/tests/test_cli.py index 45327fcf5..b9352ed9c 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -237,7 +237,7 @@ def test_create_index(db_path): ) ] == db["Gosh2"].indexes # Trying to create the same index should fail - assert 0 != CliRunner().invoke(cli.cli, create_index_unique_args).exit_code + assert CliRunner().invoke(cli.cli, create_index_unique_args).exit_code != 0 # ... unless we use --if-not-exists or --ignore for option in ("--if-not-exists", "--ignore"): assert ( @@ -349,7 +349,7 @@ def test_add_foreign_key(db_path, args, assert_message): ] ) assert ( - 0 == CliRunner().invoke(cli.cli, ["add-foreign-key", db_path] + args).exit_code + CliRunner().invoke(cli.cli, ["add-foreign-key", db_path] + args).exit_code == 0 ), assert_message assert [ ForeignKey( @@ -1105,7 +1105,7 @@ def test_upsert_alter(db_path, tmpdir): result = CliRunner().invoke( cli.cli, ["upsert", db_path, "dogs", json_path, "--pk", "id"] ) - assert 1 == result.exit_code + assert result.exit_code == 1 assert ( "Error: no such column: age\n\n" "sql = UPDATE [dogs] SET [age] = ? WHERE [id] = ?\n" @@ -1116,9 +1116,9 @@ def test_upsert_alter(db_path, tmpdir): cli.cli, ["upsert", db_path, "dogs", json_path, "--pk", "id", "--alter"] ) assert result.exit_code == 0 - assert [ + assert list(db.query("select * from dogs order by id")) == [ {"id": 1, "name": "Cleo", "age": 5}, - ] == list(db.query("select * from dogs order by id")) + ] @pytest.mark.parametrize( @@ -1240,7 +1240,7 @@ def test_create_table_error_if_table_exists(): result = runner.invoke( cli.cli, ["create-table", "test.db", "dogs", "id", "integer"] ) - assert 1 == result.exit_code + assert result.exit_code == 1 assert ( 'Error: Table "dogs" already exists. Use --replace to delete and replace it.' == result.output.strip() @@ -1290,7 +1290,7 @@ def test_create_view_error_if_view_exists(): result = runner.invoke( cli.cli, ["create-view", "test.db", "version", "select sqlite_version()"] ) - assert 1 == result.exit_code + assert result.exit_code == 1 assert ( 'Error: View "version" already exists. Use --replace to delete and replace it.' == result.output.strip() @@ -1368,7 +1368,7 @@ def test_drop_table_error(): "t2", ], ) - assert 1 == result.exit_code + assert result.exit_code == 1 assert 'Error: Table "t2" does not exist' == result.output.strip() # Using --ignore suppresses that error result = runner.invoke( @@ -1409,7 +1409,7 @@ def test_drop_view_error(): "t2", ], ) - assert 1 == result.exit_code + assert result.exit_code == 1 assert 'Error: View "t2" does not exist' == result.output.strip() # Using --ignore suppresses that error result = runner.invoke( diff --git a/tests/test_cli_convert.py b/tests/test_cli_convert.py index 97988b926..53c33bef4 100644 --- a/tests/test_cli_convert.py +++ b/tests/test_cli_convert.py @@ -49,7 +49,7 @@ def test_convert_code(fresh_db_and_path, code): result = CliRunner().invoke( cli.cli, ["convert", db_path, "t", "text", code], catch_exceptions=False ) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output value = list(db["t"].rows)[0]["text"] assert value == "Spooktober" @@ -67,7 +67,7 @@ def test_convert_code_errors(fresh_db_and_path, bad_code): result = CliRunner().invoke( cli.cli, ["convert", db_path, "t", "text", bad_code], catch_exceptions=False ) - assert 1 == result.exit_code + assert result.exit_code == 1 assert result.output == "Error: Could not compile code\n" @@ -85,7 +85,7 @@ def test_convert_import(test_db_and_path): "re", ], ) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output assert [ {"id": 1, "dt": "5th OXXober 2019 12:04"}, {"id": 2, "dt": "6th OXXober 2019 00:05:06"}, @@ -109,7 +109,7 @@ def test_convert_import_nested(fresh_db_and_path): "xml.etree.ElementTree", ], ) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output assert [ {"xml": "Cleo"}, ] == list(db["example"].rows) @@ -230,7 +230,7 @@ def test_convert_output_column(test_db_and_path, drop): if drop: args += ["--drop"] result = CliRunner().invoke(cli.cli, args) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output expected = [ { "id": 1, @@ -277,7 +277,7 @@ def test_convert_output_column_output_type(test_db_and_path, output_type, expect cli.cli, args, ) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output assert expected == list(db.execute("select id, new_id from example")) @@ -428,7 +428,7 @@ def test_recipe_jsonsplit(tmpdir, delimiter): code = 'recipes.jsonsplit(value, delimiter="{}")'.format(delimiter) args = ["convert", db_path, "example", "tags", code] result = CliRunner().invoke(cli.cli, args) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output assert list(db["example"].rows) == [ {"id": 1, "tags": '["foo", "bar"]'}, {"id": 2, "tags": '["bar", "baz"]'}, @@ -456,7 +456,7 @@ def test_recipe_jsonsplit_type(fresh_db_and_path, type, expected_array): code = "recipes.jsonsplit(value, type={})".format(type) args = ["convert", db_path, "example", "records", code] result = CliRunner().invoke(cli.cli, args) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output assert json.loads(db["example"].get(1)["records"]) == expected_array @@ -474,7 +474,7 @@ def test_recipe_jsonsplit_output(fresh_db_and_path, drop): if drop: args += ["--drop"] result = CliRunner().invoke(cli.cli, args) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output expected = { "id": 1, "records": "1,2,3", @@ -568,7 +568,7 @@ def test_convert_where_multi(fresh_db_and_path): "--multi", ], ) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output assert list(db["names"].rows) == [ {"id": 1, "name": "Cleo", "upper": None}, {"id": 2, "name": "Bants", "upper": "BANTS"}, @@ -589,7 +589,7 @@ def test_convert_code_standard_input(fresh_db_and_path): ], input="value.upper()", ) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output assert list(db["names"].rows) == [ {"id": 1, "name": "CLEO"}, ] @@ -602,7 +602,7 @@ def test_convert_hyphen_workaround(fresh_db_and_path): cli.cli, ["convert", db_path, "names", "name", '"-"'], ) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output assert list(db["names"].rows) == [ {"id": 1, "name": "-"}, ] @@ -622,7 +622,7 @@ def test_convert_initialization_pattern(fresh_db_and_path): ], input="import random\nrandom.seed(1)\ndef convert(value): return random.randint(0, 100)", ) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output assert list(db["names"].rows) == [ {"id": 1, "name": "17"}, ] @@ -650,6 +650,6 @@ def test_convert_no_skip_false(fresh_db_and_path, no_skip_false, expected): assert db["t"].get(1)["x"] == 0 assert db["t"].get(2)["x"] == 1 result = CliRunner().invoke(cli.cli, args, input="value + 1") - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output assert db["t"].get(1)["x"] == expected assert db["t"].get(2)["x"] == 2 diff --git a/tests/test_cli_insert.py b/tests/test_cli_insert.py index 274f41434..e1dfd50ba 100644 --- a/tests/test_cli_insert.py +++ b/tests/test_cli_insert.py @@ -13,7 +13,7 @@ def test_insert_simple(tmpdir): with open(json_path, "w") as fp: fp.write(json.dumps({"name": "Cleo", "age": 4})) result = CliRunner().invoke(cli.cli, ["insert", db_path, "dogs", json_path]) - assert 0 == result.exit_code + assert result.exit_code == 0 assert [{"age": 4, "name": "Cleo"}] == list( Database(db_path).query("select * from dogs") ) @@ -29,7 +29,7 @@ def test_insert_from_stdin(tmpdir): ["insert", db_path, "dogs", "-"], input=json.dumps({"name": "Cleo", "age": 4}), ) - assert 0 == result.exit_code + assert result.exit_code == 0 assert [{"age": 4, "name": "Cleo"}] == list( Database(db_path).query("select * from dogs") ) @@ -84,7 +84,7 @@ def test_insert_with_primary_key(db_path, tmpdir): result = CliRunner().invoke( cli.cli, ["insert", db_path, "dogs", json_path, "--pk", "id"] ) - assert 0 == result.exit_code + assert result.exit_code == 0 assert [{"id": 1, "age": 4, "name": "Cleo"}] == list( Database(db_path).query("select * from dogs") ) @@ -100,7 +100,7 @@ def test_insert_multiple_with_primary_key(db_path, tmpdir): result = CliRunner().invoke( cli.cli, ["insert", db_path, "dogs", json_path, "--pk", "id"] ) - assert 0 == result.exit_code + assert result.exit_code == 0 db = Database(db_path) assert dogs == list(db.query("select * from dogs order by id")) assert ["id"] == db["dogs"].pks @@ -117,7 +117,7 @@ def test_insert_multiple_with_compound_primary_key(db_path, tmpdir): result = CliRunner().invoke( cli.cli, ["insert", db_path, "dogs", json_path, "--pk", "id", "--pk", "breed"] ) - assert 0 == result.exit_code + assert result.exit_code == 0 db = Database(db_path) assert dogs == list(db.query("select * from dogs order by breed, id")) assert {"breed", "id"} == set(db["dogs"].pks) @@ -146,7 +146,7 @@ def test_insert_not_null_default(db_path, tmpdir): + ["--not-null", "name", "--not-null", "age"] + ["--default", "score", "5", "--default", "age", "1"], ) - assert 0 == result.exit_code + assert result.exit_code == 0 db = Database(db_path) assert ( "CREATE TABLE [dogs] (\n" @@ -163,7 +163,7 @@ def test_insert_binary_base64(db_path): ["insert", db_path, "files", "-"], input=r'{"content": {"$base64": true, "encoded": "aGVsbG8="}}', ) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output db = Database(db_path) actual = list(db.query("select content from files")) assert actual == [{"content": b"hello"}] @@ -175,7 +175,7 @@ def test_insert_newline_delimited(db_path): ["insert", db_path, "from_json_nl", "-", "--nl"], input='{"foo": "bar", "n": 1}\n\n{"foo": "baz", "n": 2}', ) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output db = Database(db_path) assert [ {"foo": "bar", "n": 1}, @@ -193,12 +193,12 @@ def test_insert_ignore(db_path, tmpdir): result = CliRunner().invoke( cli.cli, ["insert", db_path, "dogs", json_path, "--pk", "id"] ) - assert 0 != result.exit_code, result.output + assert result.exit_code != 0, result.output # If we use --ignore it should run OK result = CliRunner().invoke( cli.cli, ["insert", db_path, "dogs", json_path, "--pk", "id", "--ignore"] ) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output # ... but it should actually have no effect assert [{"id": 1, "name": "Cleo"}] == list(db.query("select * from dogs")) @@ -225,7 +225,7 @@ def test_insert_csv_tsv(content, options, db_path, tmpdir): ["insert", db_path, "data", file_path] + options, catch_exceptions=False, ) - assert 0 == result.exit_code + assert result.exit_code == 0 assert [{"foo": "1", "bar": "2", "baz": "cat,dog"}] == list(db["data"].rows) @@ -266,7 +266,7 @@ def test_insert_stop_after(tmpdir, input, args): ["insert", db_path, "rows", "-", "--stop-after", "2"] + args, input=input, ) - assert 0 == result.exit_code + assert result.exit_code == 0 assert [{"name": "One"}, {"name": "Two"}] == list( Database(db_path).query("select * from rows") ) @@ -288,7 +288,7 @@ def test_only_allow_one_of_nl_tsv_csv(options, db_path, tmpdir): result = CliRunner().invoke( cli.cli, ["insert", db_path, "data", file_path] + options ) - assert 0 != result.exit_code + assert result.exit_code != 0 assert "Error: Use just one of --nl, --csv or --tsv" == result.output.strip() @@ -296,7 +296,7 @@ def test_insert_replace(db_path, tmpdir): test_insert_multiple_with_primary_key(db_path, tmpdir) json_path = str(tmpdir / "insert-replace.json") db = Database(db_path) - assert 20 == db["dogs"].count + assert db["dogs"].count == 20 insert_replace_dogs = [ {"id": 1, "name": "Insert replaced 1", "age": 4}, {"id": 2, "name": "Insert replaced 2", "age": 4}, @@ -307,8 +307,8 @@ def test_insert_replace(db_path, tmpdir): result = CliRunner().invoke( cli.cli, ["insert", db_path, "dogs", json_path, "--pk", "id", "--replace"] ) - assert 0 == result.exit_code, result.output - assert 21 == db["dogs"].count + assert result.exit_code == 0, result.output + assert db["dogs"].count == 21 assert ( list(db.query("select * from dogs where id in (1, 2, 21) order by id")) == insert_replace_dogs @@ -321,7 +321,7 @@ def test_insert_truncate(db_path): ["insert", db_path, "from_json_nl", "-", "--nl", "--batch-size=1"], input='{"foo": "bar", "n": 1}\n{"foo": "baz", "n": 2}', ) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output db = Database(db_path) assert [ {"foo": "bar", "n": 1}, @@ -341,7 +341,7 @@ def test_insert_truncate(db_path): ], input='{"foo": "bam", "n": 3}\n{"foo": "bat", "n": 4}', ) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output assert [ {"foo": "bam", "n": 3}, {"foo": "bat", "n": 4}, @@ -354,21 +354,21 @@ def test_insert_alter(db_path, tmpdir): ["insert", db_path, "from_json_nl", "-", "--nl"], input='{"foo": "bar", "n": 1}\n{"foo": "baz", "n": 2}', ) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output # Should get an error with incorrect shaped additional data result = CliRunner().invoke( cli.cli, ["insert", db_path, "from_json_nl", "-", "--nl"], input='{"foo": "bar", "baz": 5}', ) - assert 0 != result.exit_code, result.output + assert result.exit_code != 0, result.output # If we run it again with --alter it should work correctly result = CliRunner().invoke( cli.cli, ["insert", db_path, "from_json_nl", "-", "--nl", "--alter"], input='{"foo": "bar", "baz": 5}', ) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output # Soundness check the database itself db = Database(db_path) assert {"foo": str, "n": int, "baz": int} == db["from_json_nl"].columns_dict @@ -389,7 +389,7 @@ def test_insert_analyze(db_path): ["insert", db_path, "rows", "-", "--nl", "--analyze"], input='{"foo": "bar", "n": 1}\n{"foo": "baz", "n": 2}', ) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output assert "sqlite_stat1" in db.table_names() @@ -399,7 +399,7 @@ def test_insert_lines(db_path): ["insert", db_path, "from_lines", "-", "--lines"], input='First line\nSecond line\n{"foo": "baz"}', ) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output db = Database(db_path) assert [ {"line": "First line"}, @@ -414,7 +414,7 @@ def test_insert_text(db_path): ["insert", db_path, "from_text", "-", "--text"], input='First line\nSecond line\n{"foo": "baz"}', ) - assert 0 == result.exit_code, result.output + assert result.exit_code == 0, result.output db = Database(db_path) assert [{"text": 'First line\nSecond line\n{"foo": "baz"}'}] == list( db.query("select text from from_text") diff --git a/tests/test_create.py b/tests/test_create.py index 6dbbb916c..92663e975 100644 --- a/tests/test_create.py +++ b/tests/test_create.py @@ -151,8 +151,8 @@ def test_create_table_from_example(fresh_db, example, expected_columns): assert people_table.last_rowid is None assert people_table.last_pk is None people_table.insert(example) - assert 1 == people_table.last_rowid - assert 1 == people_table.last_pk + assert people_table.last_rowid == 1 + assert people_table.last_pk == 1 assert ["people"] == fresh_db.table_names() assert expected_columns == [ {"name": col.name, "type": col.type} for col in fresh_db["people"].columns @@ -680,7 +680,7 @@ def test_bulk_insert_more_than_999_values(fresh_db): ), pk="id", ) - assert 100 == fresh_db["big"].count + assert fresh_db["big"].count == 100 @pytest.mark.parametrize( @@ -791,7 +791,7 @@ def test_create_index_if_not_exists(fresh_db): dogs.insert({"name": "Cleo", "twitter": "cleopaws", "age": 3, "is_good_dog": True}) assert [] == dogs.indexes dogs.create_index(["name"]) - assert 1 == len(dogs.indexes) + assert len(dogs.indexes) == 1 with pytest.raises(Exception, match="index idx_dogs_name already exists"): dogs.create_index(["name"]) dogs.create_index(["name"], if_not_exists=True) @@ -891,7 +891,7 @@ def test_insert_thousands_using_generator(fresh_db): assert [{"name": "i", "type": "INTEGER"}, {"name": "word", "type": "TEXT"}] == [ {"name": col.name, "type": col.type} for col in fresh_db["test"].columns ] - assert 10000 == fresh_db["test"].count + assert fresh_db["test"].count == 10000 def test_insert_thousands_raises_exception_with_extra_columns_after_first_100(fresh_db): @@ -930,13 +930,13 @@ def test_insert_hash_id(fresh_db): dogs = fresh_db["dogs"] id = dogs.insert({"name": "Cleo", "twitter": "cleopaws"}, hash_id="id").last_pk assert "f501265970505d9825d8d9f590bfab3519fb20b1" == id - assert 1 == dogs.count + assert dogs.count == 1 # Insert replacing a second time should not create a new row id2 = dogs.insert( {"name": "Cleo", "twitter": "cleopaws"}, hash_id="id", replace=True ).last_pk assert "f501265970505d9825d8d9f590bfab3519fb20b1" == id2 - assert 1 == dogs.count + assert dogs.count == 1 @pytest.mark.parametrize("use_table_factory", [True, False]) @@ -974,7 +974,7 @@ def test_works_with_pathlib_path(tmpdir): path = pathlib.Path(tmpdir / "test.db") db = Database(path) db["demo"].insert_all([{"foo": 1}]) - assert 1 == db["demo"].count + assert db["demo"].count == 1 @pytest.mark.skipif(pd is None, reason="pandas and numpy are not installed") @@ -1091,11 +1091,11 @@ def test_drop_ignore(fresh_db): def test_insert_all_empty_list(fresh_db): fresh_db["t"].insert({"foo": 1}) - assert 1 == fresh_db["t"].count + assert fresh_db["t"].count == 1 fresh_db["t"].insert_all([]) - assert 1 == fresh_db["t"].count + assert fresh_db["t"].count == 1 fresh_db["t"].insert_all([], replace=True) - assert 1 == fresh_db["t"].count + assert fresh_db["t"].count == 1 def test_insert_all_single_column(fresh_db): diff --git a/tests/test_delete.py b/tests/test_delete.py index f057749db..652096ce4 100644 --- a/tests/test_delete.py +++ b/tests/test_delete.py @@ -18,18 +18,18 @@ def test_delete_where(fresh_db): table = fresh_db["table"] for i in range(1, 11): table.insert({"id": i}, pk="id") - assert 10 == table.count + assert table.count == 10 table.delete_where("id > ?", [5]) - assert 5 == table.count + assert table.count == 5 def test_delete_where_all(fresh_db): table = fresh_db["table"] for i in range(1, 11): table.insert({"id": i}, pk="id") - assert 10 == table.count + assert table.count == 10 table.delete_where() - assert 0 == table.count + assert table.count == 0 def test_delete_where_analyze(fresh_db): diff --git a/tests/test_gis.py b/tests/test_gis.py index ee2e2a3aa..a4ee75ecf 100644 --- a/tests/test_gis.py +++ b/tests/test_gis.py @@ -127,7 +127,7 @@ def test_cli_create_spatialite(tmpdir): cli, ["create-database", str(db_path), "--init-spatialite"] ) - assert 0 == result.exit_code + assert result.exit_code == 0 assert db_path.exists() assert db_path.read_binary()[:16] == b"SQLite format 3\x00" @@ -155,7 +155,7 @@ def test_cli_add_geometry_column(tmpdir): ], ) - assert 0 == result.exit_code + assert result.exit_code == 0 assert db["geometry_columns"].get(["locations", "geometry"]) == { "f_table_name": "locations", @@ -189,7 +189,7 @@ def test_cli_add_geometry_column_options(tmpdir): ], ) - assert 0 == result.exit_code + assert result.exit_code == 0 assert db["geometry_columns"].get(["locations", "geometry"]) == { "f_table_name": "locations", @@ -240,6 +240,6 @@ def test_cli_create_spatial_index(tmpdir): cli, ["create-spatial-index", str(db_path), table.name, "geometry"] ) - assert 0 == result.exit_code + assert result.exit_code == 0 assert "idx_locations_geometry" in db.table_names() diff --git a/tests/test_introspect.py b/tests/test_introspect.py index c3d1b8091..f6683444e 100644 --- a/tests/test_introspect.py +++ b/tests/test_introspect.py @@ -54,18 +54,18 @@ def test_detect_fts_similar_tables(fresh_db, reverse_order): def test_tables(existing_db): - assert 1 == len(existing_db.tables) - assert "foo" == existing_db.tables[0].name + assert len(existing_db.tables) == 1 + assert existing_db.tables[0].name == "foo" def test_views(fresh_db): fresh_db.create_view("foo_view", "select 1") - assert 1 == len(fresh_db.views) + assert len(fresh_db.views) == 1 view = fresh_db.views[0] assert isinstance(view, View) - assert "foo_view" == view.name - assert "" == repr(view) - assert {"1": str} == view.columns_dict + assert view.name == "foo_view" + assert repr(view) == "" + assert view.columns_dict == {"1": str} def test_count(existing_db): diff --git a/tests/test_m2m.py b/tests/test_m2m.py index 5423d2b0e..2cb2ca353 100644 --- a/tests/test_m2m.py +++ b/tests/test_m2m.py @@ -109,9 +109,9 @@ def test_m2m_with_table_objects(fresh_db): ) expected_tables = {"dogs", "humans", "dogs_humans"} assert expected_tables == set(fresh_db.table_names()) - assert 1 == dogs.count - assert 2 == humans.count - assert 2 == fresh_db["dogs_humans"].count + assert dogs.count == 1 + assert humans.count == 2 + assert fresh_db["dogs_humans"].count == 2 def test_m2m_lookup(fresh_db): diff --git a/tests/test_update.py b/tests/test_update.py index 7e3e0ab92..916eb19b0 100644 --- a/tests/test_update.py +++ b/tests/test_update.py @@ -81,9 +81,9 @@ def test_update_with_no_values_sets_last_pk(fresh_db): table = fresh_db.table("dogs", pk="id") table.insert_all([{"id": 1, "name": "Cleo"}, {"id": 2, "name": "Pancakes"}]) table.update(1) - assert 1 == table.last_pk + assert table.last_pk == 1 table.update(2) - assert 2 == table.last_pk + assert table.last_pk == 2 with pytest.raises(NotFoundError): table.update(3) diff --git a/tests/test_upsert.py b/tests/test_upsert.py index b7267ea96..8a34d4ebe 100644 --- a/tests/test_upsert.py +++ b/tests/test_upsert.py @@ -6,25 +6,25 @@ def test_upsert(fresh_db): table = fresh_db["table"] table.insert({"id": 1, "name": "Cleo"}, pk="id") table.upsert({"id": 1, "age": 5}, pk="id", alter=True) - assert [{"id": 1, "name": "Cleo", "age": 5}] == list(table.rows) - assert 1 == table.last_pk + assert list(table.rows) == [{"id": 1, "name": "Cleo", "age": 5}] + assert table.last_pk == 1 def test_upsert_all(fresh_db): table = fresh_db["table"] table.upsert_all([{"id": 1, "name": "Cleo"}, {"id": 2, "name": "Nixie"}], pk="id") table.upsert_all([{"id": 1, "age": 5}, {"id": 2, "age": 5}], pk="id", alter=True) - assert [ + assert list(table.rows) == [ {"id": 1, "name": "Cleo", "age": 5}, {"id": 2, "name": "Nixie", "age": 5}, - ] == list(table.rows) + ] assert table.last_pk is None def test_upsert_all_single_column(fresh_db): table = fresh_db["table"] table.upsert_all([{"name": "Cleo"}], pk="name") - assert [{"name": "Cleo"}] == list(table.rows) + assert list(table.rows) == [{"name": "Cleo"}] assert table.pks == ["name"]