[roster-dns-management] r1147 committed - Correcting dnslszone so using '--no-header' actually removes the heade...

[roster-dns...@googlecode.com]

Revision: 1147
Author: cook...@gmail.com
Date: Wed Jul 10 11:39:17 2013
Log: Correcting dnslszone so using '--no-header' actually removes the
header.

http://code.google.com/p/roster-dns-management/source/detail?r=1147

Modified:
/trunk/roster-user-tools/scripts/dnslszone
/trunk/test/dnslszone_test.py

=======================================
--- /trunk/roster-user-tools/scripts/dnslszone Wed Jan 2 11:01:38 2013
+++ /trunk/roster-user-tools/scripts/dnslszone Wed Jul 10 11:39:17 2013
@@ -106,9 +106,10 @@
u'zone_name': options.zone_name,
u'cidr_block': options.cidr_block})['core_return']

+ print_list = []
if( not options.no_header ):
- print_list = [['zone_name', 'view_name', 'zone_type', 'zone_origin',
- 'zone_options', 'cidr_block']]
+
print_list.append(['zone_name', 'view_name', 'zone_type', 'zone_origin',
+ 'zone_options', 'cidr_block'])

if( command == 'reverse' ):
if( not reverse_range_zone_assignments ):
=======================================
--- /trunk/test/dnslszone_test.py Wed Jan 2 11:01:38 2013
+++ /trunk/test/dnslszone_test.py Wed Jul 10 11:39:17 2013
@@ -190,6 +190,26 @@
'10/8\n\n')
command.close()

+ def testListAllZonesNoHeader(self):
+ self.core_instance.MakeView(u'test_view')
+ self.core_instance.MakeZone(u'test_zone', u'master',
u'university.edu.',
+ view_name=u'test_view',
zone_options=u'options;')
+ self.core_instance.MakeZone(u'zone2', u'master', u'school.edu.',
+ view_name=u'test_view',
zone_options=u'stuff;',
+ make_any=False)
+ self.core_instance.MakeZone(u'reverse_zone', u'master',
u'university2.edu.',
+ view_name=u'test_view',
zone_options=u'options;')
+ self.core_instance.MakeReverseRangeZoneAssignment(u'reverse_zone',
u'10/8')
+ command = os.popen('python %s all -u %s -p %s --config-file %s -s %s
--no-header' % (
+ EXEC, USERNAME, self.password, USER_CONFIG, self.server_name))
+ self.assertEqual(command.read(),
+ 'test_zone test_view master university.edu. \'options;\' -\n'
+ 'test_zone any master university.edu. \'options;\' -\n'
+ 'zone2 test_view master school.edu. \'stuff;\' -\n'
+ 'reverse_zone test_view master university2.edu. \'options;\'
10/8\n'
+ 'reverse_zone any master university2.edu. \'options;\'
10/8\n\n')
+ command.close()
+
def testErrors(self):
command = os.popen('python %s forward -v fake_view -u %s -p %s '
'--config-file %s -s %s' % (