Merge "Fixed _is_superdomain check in central"
This commit is contained in:
commit
4444d7ea11
@ -440,7 +440,7 @@ class Service(service.RPCService):
|
||||
context.all_tenants = True
|
||||
|
||||
# Create wildcard term to catch all subdomains
|
||||
search_term = "*%s" % domain_name
|
||||
search_term = "*.%s" % domain_name
|
||||
|
||||
criterion = {'name': search_term}
|
||||
subdomains = self.storage.find_domains(context, criterion)
|
||||
|
@ -179,10 +179,6 @@ class CentralServiceTest(CentralTestCase):
|
||||
'www.example.net.')
|
||||
self.assertFalse(result)
|
||||
|
||||
LOG.debug("Testing 'example.org.'")
|
||||
result = self.central_service._is_superdomain(context, 'example.org.')
|
||||
self.assertTrue(result)
|
||||
|
||||
LOG.debug("Testing 'www.example.org.'")
|
||||
result = self.central_service._is_superdomain(context,
|
||||
'www.example.org.')
|
||||
|
Loading…
Reference in New Issue
Block a user