vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "Merge pull request #2844 from coreos-inc/alegrand/use_latest_appr_server_code"

Browse source 
This reverts commit 646fafb2fd, reversing
changes made to 5c1b635439.
This commit is contained in:
Jimmy Zelinskie 2017-08-09 20:45:46 -04:00
parent 49df658e20
commit 9e09612851
16 changed files with 68 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

22
endpoints/appr/test/test_api.py
View file

@ -2,16 +2,16 @@ import uuid
import pytest
from appr.tests.conftest import *
from appr.tests.test_apiserver import BaseTestServer
from appr.tests.test_models import ApprTestModels
from cnr.tests.conftest import *
from cnr.tests.test_apiserver import BaseTestServer
from cnr.tests.test_models import CnrTestModels
import data.oci_model.blob as oci_blob
from data.database import User
from data.model import organization, user
from endpoints.appr import registry # Needed to register the endpoint
from endpoints.appr.appr_backend import Channel, Package, QuayDB
from endpoints.appr.cnr_backend import Channel, Package, QuayDB
from endpoints.appr.models_oci import model as oci_app_model
from test.fixtures import *
@ -70,14 +70,14 @@ class PackageTest(Package):
@pytest.fixture(autouse=True)
def quaydb(monkeypatch, app):
monkeypatch.setattr('endpoints.appr.appr_backend.QuayDB.Package', PackageTest)
monkeypatch.setattr('endpoints.appr.appr_backend.Package', PackageTest)
monkeypatch.setattr('endpoints.appr.cnr_backend.QuayDB.Package', PackageTest)
monkeypatch.setattr('endpoints.appr.cnr_backend.Package', PackageTest)
monkeypatch.setattr('endpoints.appr.registry.Package', PackageTest)
monkeypatch.setattr('appr.models.Package', PackageTest)
monkeypatch.setattr('cnr.models.Package', PackageTest)
monkeypatch.setattr('endpoints.appr.appr_backend.QuayDB.Channel', ChannelTest)
monkeypatch.setattr('endpoints.appr.cnr_backend.QuayDB.Channel', ChannelTest)
monkeypatch.setattr('endpoints.appr.registry.Channel', ChannelTest)
monkeypatch.setattr('appr.models.Channel', ChannelTest)
monkeypatch.setattr('cnr.models.Channel', ChannelTest)
class TestServerQuayDB(BaseTestServer):
@ -118,13 +118,13 @@ class TestServerQuayDB(BaseTestServer):
pass
class TestQuayModels(ApprTestModels):
class TestQuayModels(CnrTestModels):
DB_CLASS = QuayDB
@pytest.mark.xfail
def test_channel_delete_releases(self, db_with_data1):
""" Can't remove a release from the channel, only delete the channel entirely """
ApprTestModels.test_channel_delete_releases(self, db_with_data1)
CnrTestModels.test_channel_delete_releases(self, db_with_data1)
@pytest.mark.xfail
def test_forbiddeb_db_reset(self, db_class):