MongoCollection.count() and update() are deprecated

Eve doesn't have any counting methods on `current_app.data`, so there is
no one-to-one translation for `cursor.count()` in
`file_storage/__init__.py`. Since the call was only used in a debug log
entry, I just removed it altogether.

I removed `pillar.cli.operations.index_users_rebuild()`, as it was
importing `pillar.api.utils.algolia.algolia_index_user_save` which doesn't
exist any more, so the code was dead anyway.
This commit is contained in:
2019-05-10 17:02:38 +02:00
parent 47d5c6cbad
commit 1e823a9dbe
13 changed files with 60 additions and 104 deletions

View File

@@ -741,7 +741,7 @@ class UserCreationTest(AbstractPillarTest):
with self.app.test_request_context():
users_coll = self.app.db().users
self.assertEqual(0, users_coll.count())
self.assertEqual(0, users_coll.count_documents({}))
self.mock_blenderid_validate_happy()
token = 'this is my life now'
@@ -749,7 +749,7 @@ class UserCreationTest(AbstractPillarTest):
with self.app.test_request_context():
users_coll = self.app.db().users
self.assertEqual(1, users_coll.count())
self.assertEqual(1, users_coll.count_documents({}))
db_user = users_coll.find()[0]
self.assertEqual(db_user['email'], TEST_EMAIL_ADDRESS)
@@ -760,7 +760,7 @@ class UserCreationTest(AbstractPillarTest):
with self.app.test_request_context():
users_coll = self.app.db().users
self.assertEqual(0, users_coll.count())
self.assertEqual(0, users_coll.count_documents({}))
bid_resp = {'status': 'success',
'user': {'email': TEST_EMAIL_ADDRESS,
@@ -778,7 +778,7 @@ class UserCreationTest(AbstractPillarTest):
with self.app.test_request_context():
users_coll = self.app.db().users
self.assertEqual(1, users_coll.count())
self.assertEqual(1, users_coll.count_documents({}))
db_user = users_coll.find()[0]
self.assertEqual(db_user['email'], TEST_EMAIL_ADDRESS)
@@ -789,7 +789,7 @@ class UserCreationTest(AbstractPillarTest):
"""Blender ID does not require full name, we do."""
with self.app.app_context():
users_coll = self.app.db().users
self.assertEqual(0, users_coll.count())
self.assertEqual(0, users_coll.count_documents({}))
# First request will create the user, the 2nd request will update.
self.mock_blenderid_validate_happy()
@@ -818,7 +818,7 @@ class UserCreationTest(AbstractPillarTest):
self.get('/api/users/me', auth_token=token)
with self.app.app_context():
self.assertEqual(1, users_coll.count())
self.assertEqual(1, users_coll.count_documents({}))
db_user = users_coll.find()[0]
self.assertEqual(db_user['email'], TEST_EMAIL_ADDRESS)

View File

@@ -81,7 +81,7 @@ class CommentEditTest(AbstractPillarTest):
with self.app.app_context():
proj_coll = self.app.db('projects')
proj_coll.update(
proj_coll.update_one(
{'_id': self.pid},
{'$set': {
'node_types': self.project['node_types'],

View File

@@ -690,7 +690,7 @@ class NodesReferencedByProjectTest(AbstractPillarTest):
self.node_etag = node['_etag']
with self.app.app_context():
self.app.db('projects').update(
self.app.db('projects').update_one(
{'_id': self.pid},
{'$set': {
'header_node': self.node_id,

View File

@@ -24,13 +24,13 @@ class OrganizationCruTest(AbstractPillarTest):
self.enter_app_context()
# There should be no organizations to begin with.
db = self.app.db('organizations')
self.assertEqual(0, db.count())
org_coll = self.app.db('organizations')
self.assertEqual(0, org_coll.count_documents({}))
admin_uid = self.create_user(24 * 'a')
org_doc = self.app.org_manager.create_new_org('Хакеры', admin_uid, 25)
self.assertIsNotNone(db.find_one(org_doc['_id']))
self.assertIsNotNone(org_coll.find_one(org_doc['_id']))
self.assertEqual(bson.ObjectId(24 * 'a'), org_doc['admin_uid'])
self.assertEqual('Хакеры', org_doc['name'])
self.assertEqual(25, org_doc['seat_count'])