mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2026-02-11 17:46:20 +01:00
Fix: Can not update biomassed characters
This commit is contained in:
Erik Kalkoken
Ariel Rin
@@ -1,245 +1,271 @@
|
||||
from unittest.mock import patch, Mock
|
||||
from unittest.mock import patch
|
||||
|
||||
from django.test import TestCase
|
||||
from django.test import TestCase, TransactionTestCase, override_settings
|
||||
|
||||
from ..models import EveCharacter, EveCorporationInfo, EveAllianceInfo
|
||||
from ..models import EveAllianceInfo, EveCharacter, EveCorporationInfo
|
||||
from ..tasks import (
|
||||
run_model_update,
|
||||
update_alliance,
|
||||
update_corp,
|
||||
update_character,
|
||||
run_model_update
|
||||
update_character_chunk,
|
||||
update_corp,
|
||||
)
|
||||
from .esi_client_stub import EsiClientStub
|
||||
|
||||
|
||||
class TestTasks(TestCase):
|
||||
|
||||
@patch('allianceauth.eveonline.tasks.EveCorporationInfo')
|
||||
def test_update_corp(self, mock_EveCorporationInfo):
|
||||
update_corp(42)
|
||||
self.assertEqual(
|
||||
mock_EveCorporationInfo.objects.update_corporation.call_count, 1
|
||||
)
|
||||
self.assertEqual(
|
||||
mock_EveCorporationInfo.objects.update_corporation.call_args[0][0], 42
|
||||
@patch('allianceauth.eveonline.providers.esi_client_factory')
|
||||
class TestUpdateTasks(TestCase):
|
||||
def test_should_update_alliance(self, mock_esi_client_factory):
|
||||
# given
|
||||
mock_esi_client_factory.return_value = EsiClientStub()
|
||||
my_alliance = EveAllianceInfo.objects.create(
|
||||
alliance_id=3001,
|
||||
alliance_name="Wayne Enterprises",
|
||||
alliance_ticker="WYE",
|
||||
executor_corp_id=2003
|
||||
)
|
||||
# when
|
||||
update_alliance(my_alliance.alliance_id)
|
||||
# then
|
||||
my_alliance.refresh_from_db()
|
||||
self.assertEqual(my_alliance.executor_corp_id, 2001)
|
||||
|
||||
@patch('allianceauth.eveonline.tasks.EveAllianceInfo')
|
||||
def test_update_alliance(self, mock_EveAllianceInfo):
|
||||
update_alliance(42)
|
||||
self.assertEqual(
|
||||
mock_EveAllianceInfo.objects.update_alliance.call_args[0][0], 42
|
||||
)
|
||||
self.assertEqual(
|
||||
mock_EveAllianceInfo.objects
|
||||
.update_alliance.return_value.populate_alliance.call_count, 1
|
||||
def test_should_update_character(self, mock_esi_client_factory):
|
||||
# given
|
||||
mock_esi_client_factory.return_value = EsiClientStub()
|
||||
my_character = EveCharacter.objects.create(
|
||||
character_id=1001,
|
||||
character_name="Bruce Wayne",
|
||||
corporation_id=2002,
|
||||
corporation_name="Wayne Food",
|
||||
corporation_ticker="WYF",
|
||||
alliance_id=None
|
||||
)
|
||||
# when
|
||||
update_character(my_character.character_id)
|
||||
# then
|
||||
my_character.refresh_from_db()
|
||||
self.assertEqual(my_character.corporation_id, 2001)
|
||||
|
||||
@patch('allianceauth.eveonline.tasks.EveCharacter')
|
||||
def test_update_character(self, mock_EveCharacter):
|
||||
update_character(42)
|
||||
self.assertEqual(
|
||||
mock_EveCharacter.objects.update_character.call_count, 1
|
||||
def test_should_update_corp(self, mock_esi_client_factory):
|
||||
# given
|
||||
mock_esi_client_factory.return_value = EsiClientStub()
|
||||
EveAllianceInfo.objects.create(
|
||||
alliance_id=3001,
|
||||
alliance_name="Wayne Enterprises",
|
||||
alliance_ticker="WYE",
|
||||
executor_corp_id=2003
|
||||
)
|
||||
self.assertEqual(
|
||||
mock_EveCharacter.objects.update_character.call_args[0][0], 42
|
||||
my_corporation = EveCorporationInfo.objects.create(
|
||||
corporation_id=2003,
|
||||
corporation_name="Wayne Food",
|
||||
corporation_ticker="WFO",
|
||||
member_count=1,
|
||||
alliance=None,
|
||||
ceo_id=1999
|
||||
)
|
||||
# when
|
||||
update_corp(my_corporation.corporation_id)
|
||||
# then
|
||||
my_corporation.refresh_from_db()
|
||||
self.assertEqual(my_corporation.alliance.alliance_id, 3001)
|
||||
|
||||
# @patch('allianceauth.eveonline.tasks.EveCharacter')
|
||||
# def test_update_character(self, mock_EveCharacter):
|
||||
# update_character(42)
|
||||
# self.assertEqual(
|
||||
# mock_EveCharacter.objects.update_character.call_count, 1
|
||||
# )
|
||||
# self.assertEqual(
|
||||
# mock_EveCharacter.objects.update_character.call_args[0][0], 42
|
||||
# )
|
||||
|
||||
|
||||
@patch('allianceauth.eveonline.tasks.update_character')
|
||||
@patch('allianceauth.eveonline.tasks.update_alliance')
|
||||
@patch('allianceauth.eveonline.tasks.update_corp')
|
||||
@patch('allianceauth.eveonline.providers.provider')
|
||||
@override_settings(CELERY_ALWAYS_EAGER=True)
|
||||
@patch('allianceauth.eveonline.providers.esi_client_factory')
|
||||
@patch('allianceauth.eveonline.tasks.providers')
|
||||
@patch('allianceauth.eveonline.tasks.CHUNK_SIZE', 2)
|
||||
class TestRunModelUpdate(TestCase):
|
||||
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
super().setUpClass()
|
||||
EveCorporationInfo.objects.all().delete()
|
||||
EveAllianceInfo.objects.all().delete()
|
||||
EveCharacter.objects.all().delete()
|
||||
|
||||
class TestRunModelUpdate(TransactionTestCase):
|
||||
def test_should_run_updates(self, mock_providers, mock_esi_client_factory):
|
||||
# given
|
||||
mock_providers.provider.client = EsiClientStub()
|
||||
mock_esi_client_factory.return_value = EsiClientStub()
|
||||
EveCorporationInfo.objects.create(
|
||||
corporation_id=2345,
|
||||
corporation_name='corp.name',
|
||||
corporation_ticker='c.c.t',
|
||||
corporation_id=2001,
|
||||
corporation_name="Wayne Technologies",
|
||||
corporation_ticker="WTE",
|
||||
member_count=10,
|
||||
alliance=None,
|
||||
)
|
||||
EveAllianceInfo.objects.create(
|
||||
alliance_id=3456,
|
||||
alliance_name='alliance.name',
|
||||
alliance_ticker='a.t',
|
||||
executor_corp_id=5,
|
||||
alliance_3001 = EveAllianceInfo.objects.create(
|
||||
alliance_id=3001,
|
||||
alliance_name="Wayne Enterprises",
|
||||
alliance_ticker="WYE",
|
||||
executor_corp_id=2003
|
||||
)
|
||||
EveCharacter.objects.create(
|
||||
character_id=1,
|
||||
character_name='character.name1',
|
||||
corporation_id=2345,
|
||||
corporation_name='character.corp.name',
|
||||
corporation_ticker='c.c.t', # max 5 chars
|
||||
corporation_2003 = EveCorporationInfo.objects.create(
|
||||
corporation_id=2003,
|
||||
corporation_name="Wayne Energy",
|
||||
corporation_ticker="WEG",
|
||||
member_count=99,
|
||||
alliance=None,
|
||||
)
|
||||
character_1001 = EveCharacter.objects.create(
|
||||
character_id=1001,
|
||||
character_name="Bruce Wayne",
|
||||
corporation_id=2002,
|
||||
corporation_name="Wayne Food",
|
||||
corporation_ticker="WYF",
|
||||
alliance_id=None
|
||||
)
|
||||
EveCharacter.objects.create(
|
||||
character_id=2,
|
||||
character_name='character.name2',
|
||||
corporation_id=9876,
|
||||
corporation_name='character.corp.name',
|
||||
corporation_ticker='c.c.t', # max 5 chars
|
||||
alliance_id=3456,
|
||||
alliance_name='character.alliance.name',
|
||||
)
|
||||
EveCharacter.objects.create(
|
||||
character_id=3,
|
||||
character_name='character.name3',
|
||||
corporation_id=9876,
|
||||
corporation_name='character.corp.name',
|
||||
corporation_ticker='c.c.t', # max 5 chars
|
||||
alliance_id=3456,
|
||||
alliance_name='character.alliance.name',
|
||||
)
|
||||
EveCharacter.objects.create(
|
||||
character_id=4,
|
||||
character_name='character.name4',
|
||||
corporation_id=9876,
|
||||
corporation_name='character.corp.name',
|
||||
corporation_ticker='c.c.t', # max 5 chars
|
||||
alliance_id=3456,
|
||||
alliance_name='character.alliance.name',
|
||||
)
|
||||
"""
|
||||
EveCharacter.objects.create(
|
||||
character_id=5,
|
||||
character_name='character.name5',
|
||||
corporation_id=9876,
|
||||
corporation_name='character.corp.name',
|
||||
corporation_ticker='c.c.t', # max 5 chars
|
||||
alliance_id=3456,
|
||||
alliance_name='character.alliance.name',
|
||||
)
|
||||
"""
|
||||
|
||||
def setUp(self):
|
||||
self.affiliations = [
|
||||
{'character_id': 1, 'corporation_id': 5},
|
||||
{'character_id': 2, 'corporation_id': 9876, 'alliance_id': 3456},
|
||||
{'character_id': 3, 'corporation_id': 9876, 'alliance_id': 7456},
|
||||
{'character_id': 4, 'corporation_id': 9876, 'alliance_id': 3456}
|
||||
]
|
||||
self.names = [
|
||||
{'id': 1, 'name': 'character.name1'},
|
||||
{'id': 2, 'name': 'character.name2'},
|
||||
{'id': 3, 'name': 'character.name3'},
|
||||
{'id': 4, 'name': 'character.name4_new'}
|
||||
]
|
||||
|
||||
def test_normal_run(
|
||||
self,
|
||||
mock_provider,
|
||||
mock_update_corp,
|
||||
mock_update_alliance,
|
||||
mock_update_character,
|
||||
):
|
||||
def get_affiliations(characters: list):
|
||||
response = [x for x in self.affiliations if x['character_id'] in characters]
|
||||
mock_operator = Mock(**{'result.return_value': response})
|
||||
return mock_operator
|
||||
|
||||
def get_names(ids: list):
|
||||
response = [x for x in self.names if x['id'] in ids]
|
||||
mock_operator = Mock(**{'result.return_value': response})
|
||||
return mock_operator
|
||||
|
||||
mock_provider.client.Character.post_characters_affiliation.side_effect \
|
||||
= get_affiliations
|
||||
|
||||
mock_provider.client.Universe.post_universe_names.side_effect = get_names
|
||||
|
||||
# when
|
||||
run_model_update()
|
||||
|
||||
# then
|
||||
character_1001.refresh_from_db()
|
||||
self.assertEqual(
|
||||
mock_provider.client.Character.post_characters_affiliation.call_count, 2
|
||||
character_1001.corporation_id, 2001 # char has new corp
|
||||
)
|
||||
corporation_2003.refresh_from_db()
|
||||
self.assertEqual(
|
||||
mock_provider.client.Universe.post_universe_names.call_count, 2
|
||||
corporation_2003.alliance.alliance_id, 3001 # corp has new alliance
|
||||
)
|
||||
alliance_3001.refresh_from_db()
|
||||
self.assertEqual(
|
||||
alliance_3001.executor_corp_id, 2001 # alliance has been updated
|
||||
)
|
||||
|
||||
# character 1 has changed corp
|
||||
# character 2 no change
|
||||
# character 3 has changed alliance
|
||||
# character 4 has changed name
|
||||
self.assertEqual(mock_update_corp.apply_async.call_count, 1)
|
||||
self.assertEqual(
|
||||
int(mock_update_corp.apply_async.call_args[1]['args'][0]), 2345
|
||||
)
|
||||
self.assertEqual(mock_update_alliance.apply_async.call_count, 1)
|
||||
self.assertEqual(
|
||||
int(mock_update_alliance.apply_async.call_args[1]['args'][0]), 3456
|
||||
)
|
||||
characters_updated = {
|
||||
x[1]['args'][0] for x in mock_update_character.apply_async.call_args_list
|
||||
|
||||
@override_settings(CELERY_ALWAYS_EAGER=True)
|
||||
@patch('allianceauth.eveonline.tasks.update_character', wraps=update_character)
|
||||
@patch('allianceauth.eveonline.providers.esi_client_factory')
|
||||
@patch('allianceauth.eveonline.tasks.providers')
|
||||
@patch('allianceauth.eveonline.tasks.CHUNK_SIZE', 2)
|
||||
class TestUpdateCharacterChunk(TestCase):
|
||||
@staticmethod
|
||||
def _updated_character_ids(spy_update_character) -> set:
|
||||
"""Character IDs passed to update_character task for update."""
|
||||
return {
|
||||
x[1]["args"][0] for x in spy_update_character.apply_async.call_args_list
|
||||
}
|
||||
excepted = {1, 3, 4}
|
||||
self.assertSetEqual(characters_updated, excepted)
|
||||
|
||||
def test_ignore_character_not_in_affiliations(
|
||||
self,
|
||||
mock_provider,
|
||||
mock_update_corp,
|
||||
mock_update_alliance,
|
||||
mock_update_character,
|
||||
def test_should_update_corp_change(
|
||||
self, mock_providers, mock_esi_client_factory, spy_update_character
|
||||
):
|
||||
def get_affiliations(characters: list):
|
||||
response = [x for x in self.affiliations if x['character_id'] in characters]
|
||||
mock_operator = Mock(**{'result.return_value': response})
|
||||
return mock_operator
|
||||
# given
|
||||
mock_providers.provider.client = EsiClientStub()
|
||||
mock_esi_client_factory.return_value = EsiClientStub()
|
||||
character_1001 = EveCharacter.objects.create(
|
||||
character_id=1001,
|
||||
character_name="Bruce Wayne",
|
||||
corporation_id=2003,
|
||||
corporation_name="Wayne Energy",
|
||||
corporation_ticker="WEG",
|
||||
alliance_id=3001,
|
||||
alliance_name="Wayne Enterprises",
|
||||
alliance_ticker="WYE",
|
||||
)
|
||||
character_1002 = EveCharacter.objects.create(
|
||||
character_id=1002,
|
||||
character_name="Peter Parker",
|
||||
corporation_id=2001,
|
||||
corporation_name="Wayne Technologies",
|
||||
corporation_ticker="WTE",
|
||||
alliance_id=3001,
|
||||
alliance_name="Wayne Enterprises",
|
||||
alliance_ticker="WYE",
|
||||
)
|
||||
# when
|
||||
update_character_chunk([
|
||||
character_1001.character_id, character_1002.character_id
|
||||
])
|
||||
# then
|
||||
character_1001.refresh_from_db()
|
||||
self.assertEqual(character_1001.corporation_id, 2001)
|
||||
self.assertSetEqual(self._updated_character_ids(spy_update_character), {1001})
|
||||
|
||||
def get_names(ids: list):
|
||||
response = [x for x in self.names if x['id'] in ids]
|
||||
mock_operator = Mock(**{'result.return_value': response})
|
||||
return mock_operator
|
||||
|
||||
del self.affiliations[0]
|
||||
|
||||
mock_provider.client.Character.post_characters_affiliation.side_effect \
|
||||
= get_affiliations
|
||||
|
||||
mock_provider.client.Universe.post_universe_names.side_effect = get_names
|
||||
|
||||
run_model_update()
|
||||
characters_updated = {
|
||||
x[1]['args'][0] for x in mock_update_character.apply_async.call_args_list
|
||||
}
|
||||
excepted = {3, 4}
|
||||
self.assertSetEqual(characters_updated, excepted)
|
||||
|
||||
def test_ignore_character_not_in_names(
|
||||
self,
|
||||
mock_provider,
|
||||
mock_update_corp,
|
||||
mock_update_alliance,
|
||||
mock_update_character,
|
||||
def test_should_update_name_change(
|
||||
self, mock_providers, mock_esi_client_factory, spy_update_character
|
||||
):
|
||||
def get_affiliations(characters: list):
|
||||
response = [x for x in self.affiliations if x['character_id'] in characters]
|
||||
mock_operator = Mock(**{'result.return_value': response})
|
||||
return mock_operator
|
||||
# given
|
||||
mock_providers.provider.client = EsiClientStub()
|
||||
mock_esi_client_factory.return_value = EsiClientStub()
|
||||
character_1001 = EveCharacter.objects.create(
|
||||
character_id=1001,
|
||||
character_name="Batman",
|
||||
corporation_id=2001,
|
||||
corporation_name="Wayne Technologies",
|
||||
corporation_ticker="WTE",
|
||||
alliance_id=3001,
|
||||
alliance_name="Wayne Technologies",
|
||||
alliance_ticker="WYT",
|
||||
)
|
||||
# when
|
||||
update_character_chunk([character_1001.character_id])
|
||||
# then
|
||||
character_1001.refresh_from_db()
|
||||
self.assertEqual(character_1001.character_name, "Bruce Wayne")
|
||||
self.assertSetEqual(self._updated_character_ids(spy_update_character), {1001})
|
||||
|
||||
def get_names(ids: list):
|
||||
response = [x for x in self.names if x['id'] in ids]
|
||||
mock_operator = Mock(**{'result.return_value': response})
|
||||
return mock_operator
|
||||
def test_should_update_alliance_change(
|
||||
self, mock_providers, mock_esi_client_factory, spy_update_character
|
||||
):
|
||||
# given
|
||||
mock_providers.provider.client = EsiClientStub()
|
||||
mock_esi_client_factory.return_value = EsiClientStub()
|
||||
character_1001 = EveCharacter.objects.create(
|
||||
character_id=1001,
|
||||
character_name="Bruce Wayne",
|
||||
corporation_id=2001,
|
||||
corporation_name="Wayne Technologies",
|
||||
corporation_ticker="WTE",
|
||||
alliance_id=None,
|
||||
)
|
||||
# when
|
||||
update_character_chunk([character_1001.character_id])
|
||||
# then
|
||||
character_1001.refresh_from_db()
|
||||
self.assertEqual(character_1001.alliance_id, 3001)
|
||||
self.assertSetEqual(self._updated_character_ids(spy_update_character), {1001})
|
||||
|
||||
del self.names[3]
|
||||
def test_should_not_update_when_not_changed(
|
||||
self, mock_providers, mock_esi_client_factory, spy_update_character
|
||||
):
|
||||
# given
|
||||
mock_providers.provider.client = EsiClientStub()
|
||||
mock_esi_client_factory.return_value = EsiClientStub()
|
||||
character_1001 = EveCharacter.objects.create(
|
||||
character_id=1001,
|
||||
character_name="Bruce Wayne",
|
||||
corporation_id=2001,
|
||||
corporation_name="Wayne Technologies",
|
||||
corporation_ticker="WTE",
|
||||
alliance_id=3001,
|
||||
alliance_name="Wayne Technologies",
|
||||
alliance_ticker="WYT",
|
||||
)
|
||||
# when
|
||||
update_character_chunk([character_1001.character_id])
|
||||
# then
|
||||
self.assertSetEqual(self._updated_character_ids(spy_update_character), set())
|
||||
|
||||
mock_provider.client.Character.post_characters_affiliation.side_effect \
|
||||
= get_affiliations
|
||||
|
||||
mock_provider.client.Universe.post_universe_names.side_effect = get_names
|
||||
|
||||
run_model_update()
|
||||
characters_updated = {
|
||||
x[1]['args'][0] for x in mock_update_character.apply_async.call_args_list
|
||||
}
|
||||
excepted = {1, 3}
|
||||
self.assertSetEqual(characters_updated, excepted)
|
||||
def test_should_fall_back_to_single_updates_when_bulk_update_failed(
|
||||
self, mock_providers, mock_esi_client_factory, spy_update_character
|
||||
):
|
||||
# given
|
||||
mock_providers.provider.client.Character.post_characters_affiliation\
|
||||
.side_effect = OSError
|
||||
mock_esi_client_factory.return_value = EsiClientStub()
|
||||
character_1001 = EveCharacter.objects.create(
|
||||
character_id=1001,
|
||||
character_name="Bruce Wayne",
|
||||
corporation_id=2001,
|
||||
corporation_name="Wayne Technologies",
|
||||
corporation_ticker="WTE",
|
||||
alliance_id=3001,
|
||||
alliance_name="Wayne Technologies",
|
||||
alliance_ticker="WYT",
|
||||
)
|
||||
# when
|
||||
update_character_chunk([character_1001.character_id])
|
||||
# then
|
||||
self.assertSetEqual(self._updated_character_ids(spy_update_character), {1001})
|
||||
|
||||
Reference in New Issue
Block a user