diff -r 57e8168ba8c4 -r 0f9cae2d7147 test_bind.py
--- a/test_bind.py	Sun Jul 12 00:43:36 2009 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-#!/usr/bin/env python2.5
-"""
-    Test bind_conf
-"""
-
-import bind_conf as bindc
-import test_conf, addr
-
-import unittest
-
-class TestBINDConf (test_conf._TestConfBase) :
-    def test_comment (self) :
-        self.assert_obj(bindc.Comment("test comment 2"), [ "; test comment 2" ])
-    
-    def assert_str (self, label, value) :
-        self.assertEqual(str(label), value)
-
-    def test_label (self) :
-        self.assert_str(bindc.Label("foo"), "foo")
-
-    def test_origin (self) :
-        self.assert_str(bindc.Origin(), "@")
-
-    def test_fqdn (self) :
-        self.assert_str(bindc.FQDN("foo.com"), "foo.com.")
-
-    def test_interval (self) :
-        self.assert_str(bindc.Interval(12), "12")
-        self.assert_str(bindc.Interval(12, 1), "12s1m")
-        self.assert_str(bindc.Interval(h=2, d=5), "2h5d")
-
-    def assert_rec (self, obj, lines) :
-        """
-            Does a whitespace-insensitive compare of the record's formatted output and the given lines
-        """
-
-        for obj_line, line in zip(obj.fmt_lines(), lines) :
-            obj_line = ' '.join(obj_line.split())
-            self.assertEqual(obj_line, line)
-
-    def test_record (self) :
-        self.assert_rec(bindc.ResourceRecord(None, 'A', addr.IP("1.2.3.4"), cls='TST', ttl=60), [ "60 TST A 1.2.3.4" ])
-        self.assert_rec(bindc.ResourceRecord('foo', 'CNAME', 'blaa'), [ "foo IN CNAME blaa" ])
-        self.assert_rec(bindc.ResourceRecord('bar', 'CNAME', bindc.FQDN('example.com')), [ "bar IN CNAME example.com." ])
-        
-    def test_record_types (self) :
-        self.assert_rec(bindc.SOA(None, 'ns1', 'hostmaster', '2009040200', bindc.Interval(1), 2, 3, 4), [
-                "IN SOA ns1 hostmaster ( 2009040200 1 2 3 4 )"
-            ])
-        self.assert_rec(bindc.A('foo', addr.IP("1.2.3.4")), [ "foo IN A 1.2.3.4" ])
-        self.assert_rec(bindc.AAAA('foo2', addr.IP("2001::5")), [ "foo2 IN AAAA 2001::5" ])
-        self.assert_rec(bindc.CNAME('foo3', bindc.FQDN("foo.com")), [ "foo3 IN CNAME foo.com." ])
-        self.assert_rec(bindc.TXT('test4', "this is some text"), [ "test4 IN TXT \"this is some text\"" ])
-        self.assert_rec(bindc.MX(None, 10, "foo"), [ "IN MX 10 foo" ])
-        self.assert_rec(bindc.NS(None, "ns2"), [ "IN NS ns2" ])
-        self.assert_rec(bindc.PTR(addr.IP("1.2.3.4"), 'bar'), [ "4.3.2.1.in-addr.arpa. IN PTR bar" ])
-    
-    def test_directive (self) :
-        self.assert_obj(bindc.Directive("TEST", "a", None, 2, comments=["hmm..."]), [
-                "; hmm...",
-                "$TEST a 2"
-            ])
-        self.assert_obj(bindc.OriginDirective(bindc.FQDN("foo.com")), [ "$ORIGIN foo.com." ])
-        self.assert_obj(bindc.TTLDirective(bindc.Interval(h=2)), [ "$TTL 2h" ])
-        self.assert_obj(bindc.IncludeDirective("db.foo.com"), [ "$INCLUDE db.foo.com" ])
-        self.assert_obj(bindc.GenerateDirective((1, 10), "dyn${0,2}", 'A', "1.2.3.$"), [ "$GENERATE 1-10 dyn${0,2} A 1.2.3.$" ])
-
-if __name__ == '__main__' :
-    unittest.main()
-