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

Revert "Merge pull request #1678 from coreos-inc/delete-repo-fix"

Browse source 
This reverts commit df64caf133, reversing
changes made to 0d1e453566.
This commit is contained in:
Jimmy Zelinskie 2016-08-05 16:39:01 -04:00
parent ce14b9dddf
commit 22a25ac2d3
2 changed files with 5 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

11
test/test_api_usage.py
View file

@ -1654,17 +1654,14 @@ class log_queries(object):
class check_transitive_deletes(log_queries):
def __init__(self, allowed_query_check=None):
def __init__(self):
super(check_transitive_deletes, self).__init__(query_filter=r'^DELETE.+IN \(SELECT.+$')
self.allowed_query_check = allowed_query_check
def __exit__(self, exc_type, exc_val, exc_tb):
super(check_transitive_deletes, self).__exit__(exc_type, exc_val, exc_tb)
queries = self.get_queries()
if queries and self.allowed_query_check:
for query in queries:
if query.find(self.allowed_query_check) < 0:
raise Exception('Detected transitive deletion in queries: %s' % queries)
if queries:
raise Exception('Detected transitive deletion in queries: %s' % queries)
class TestDeleteRepository(ApiTestCase):
@ -1750,7 +1747,7 @@ class TestDeleteRepository(ApiTestCase):
date=datetime.datetime.now() - datetime.timedelta(days=5), count=6)
# Delete the repository.
with check_transitive_deletes(allowed_query_check='todelete'):
with check_transitive_deletes():
self.deleteResponse(Repository, params=dict(repository=self.COMPLEX_REPO))
# Verify the repo was deleted.