pedro
/
django-orchestra-test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improved domain tests

This commit is contained in:
Marc 2014-10-10 14:55:48 +00:00
parent 759549c9d7
commit ed088d5539
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
orchestra/apps/domains/backends.py
View File

@ -26,7 +26,6 @@ class Bind9MasterDomainBackend(ServiceController):
def save(self, domain): def save(self, domain):
context = self.get_context(domain) context = self.get_context(domain)
domain.refresh_serial() domain.refresh_serial()
print domain.render_zone()
context['zone'] = ';; %(banner)s\n' % context context['zone'] = ';; %(banner)s\n' % context
context['zone'] += domain.render_zone() context['zone'] += domain.render_zone()
self.append("{ echo -e '%(zone)s' | diff -N -I'^;;' %(zone_path)s - ; } ||" self.append("{ echo -e '%(zone)s' | diff -N -I'^;;' %(zone_path)s - ; } ||"

12
orchestra/apps/domains/tests/functional_tests/tests.py
View File

@ -124,7 +124,6 @@ class DomainTestMixin(object):
self.assertNotEqual(hostmaster, soa[5]) self.assertNotEqual(hostmaster, soa[5])
def validate_update(self, server_addr, domain_name): def validate_update(self, server_addr, domain_name):
Domain.objects.get(name=domain_name)
context = { context = {
'domain_name': domain_name, 'domain_name': domain_name,
'server_addr': server_addr 'server_addr': server_addr
@ -163,6 +162,11 @@ class DomainTestMixin(object):
self.assertIn(mx[4], ['30', '40']) self.assertIn(mx[4], ['30', '40'])
self.assertIn(mx[5], ['mail3.orchestra.lan.', 'mail4.orchestra.lan.']) self.assertIn(mx[5], ['mail3.orchestra.lan.', 'mail4.orchestra.lan.'])
def validate_www_update(self, server_addr, domain_name):
context = {
'domain_name': domain_name,
'server_addr': server_addr
}
dig_cname = 'dig @%(server_addr)s www.%(domain_name)s CNAME | grep "\sCNAME\s"' dig_cname = 'dig @%(server_addr)s www.%(domain_name)s CNAME | grep "\sCNAME\s"'
cname = run(dig_cname % context).stdout.split() cname = run(dig_cname % context).stdout.split()
# testdomain.org. 3600 IN MX 10 orchestra.lan. # testdomain.org. 3600 IN MX 10 orchestra.lan.
@ -196,11 +200,15 @@ class DomainTestMixin(object):
self.add(self.domain_name, self.domain_records) self.add(self.domain_name, self.domain_records)
self.addCleanup(partial(self.delete, self.domain_name)) self.addCleanup(partial(self.delete, self.domain_name))
self.update(self.domain_name, self.domain_update_records) self.update(self.domain_name, self.domain_update_records)
self.add(self.www_name, self.www_records)
time.sleep(0.5) time.sleep(0.5)
self.validate_update(self.MASTER_SERVER_ADDR, self.domain_name) self.validate_update(self.MASTER_SERVER_ADDR, self.domain_name)
time.sleep(5) time.sleep(5)
self.validate_update(self.SLAVE_SERVER_ADDR, self.domain_name) self.validate_update(self.SLAVE_SERVER_ADDR, self.domain_name)
self.add(self.www_name, self.www_records)
time.sleep(0.5)
self.validate_www_update(self.MASTER_SERVER_ADDR, self.domain_name)
time.sleep(5)
self.validate_www_update(self.SLAVE_SERVER_ADDR, self.domain_name)
def test_add_add_delete_delete(self): def test_add_add_delete_delete(self):
self.add(self.ns1_name, self.ns1_records) self.add(self.ns1_name, self.ns1_records)

4
orchestra/apps/orchestration/middlewares.py
View File

@ -92,10 +92,6 @@ class OperationsMiddleware(object):
# except when we are deleting it # except when we are deleting it
pending_operations.discard(operation) pending_operations.discard(operation)
pending_operations.add(operation) pending_operations.add(operation)
try:
print kwargs['instance'], good_action
except:
pass
def process_request(self, request): def process_request(self, request):
""" Store request on a thread local variable """ """ Store request on a thread local variable """