Phase 2 of Appr migration

Backfills the new tables from the old ones, and switches all code to read and write from the new tables
This commit is contained in:
Joseph Schorr 2018-07-08 10:15:43 +03:00
parent d75e932d09
commit acb7d626a4
4 changed files with 38 additions and 9 deletions

View file

@ -27,7 +27,7 @@ from app import app, config_provider, all_queues, dockerfile_build_queue, notifi
from buildtrigger.basehandler import BuildTriggerHandler
from initdb import setup_database_for_testing, finished_database_for_testing
from data import database, model, appr_model
from data.appr_model.models import OLD_MODELS
from data.appr_model.models import NEW_MODELS
from data.database import RepositoryActionCount, Repository as RepositoryTable
from test.helpers import assert_action_logged
from util.secscan.fake import fake_security_scanner
@ -2155,10 +2155,10 @@ class TestDeleteRepository(ApiTestCase):
repository = model.repository.get_repository(ADMIN_ACCESS_USER, 'complex')
# Add some CNR tags and linked tags.
base_tag = appr_model.tag.create_or_update_tag(repository, 'somebasetag', OLD_MODELS)
base_tag2 = appr_model.tag.create_or_update_tag(repository, 'somebasetag2', OLD_MODELS)
appr_model.tag.create_or_update_tag(repository, 'somelinkedtag', OLD_MODELS, linked_tag=base_tag)
appr_model.tag.create_or_update_tag(repository, 'somelinkedtag2', OLD_MODELS, linked_tag=base_tag2)
base_tag = appr_model.tag.create_or_update_tag(repository, 'somebasetag', NEW_MODELS)
base_tag2 = appr_model.tag.create_or_update_tag(repository, 'somebasetag2', NEW_MODELS)
appr_model.tag.create_or_update_tag(repository, 'somelinkedtag', NEW_MODELS, linked_tag=base_tag)
appr_model.tag.create_or_update_tag(repository, 'somelinkedtag2', NEW_MODELS, linked_tag=base_tag2)
# Create some access tokens.
access_token = model.token.create_access_token(repository, 'read')