BIND 10 trac1259, updated. dffd036cad40c62d4886cdc67ca9cb965fc8c493 Merge branch 'trac1259' of git+ssh://git.bind10.isc.org/var/bind10/git/bind10 into work/diffs

[BIND 10 source code commits]

The branch, trac1259 has been updated
       via  dffd036cad40c62d4886cdc67ca9cb965fc8c493 (commit)
       via  8ce40db4128ec86cec2cae25261bcb5d48a921cc (commit)
      from  85ac49c5282c231c71b8d2046889d22b0061db08 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dffd036cad40c62d4886cdc67ca9cb965fc8c493
Merge: 8ce40db4128ec86cec2cae25261bcb5d48a921cc 85ac49c5282c231c71b8d2046889d22b0061db08
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Oct 4 19:55:10 2011 +0200

    Merge branch 'trac1259' of git+ssh://git.bind10.isc.org/var/bind10/git/bind10 into work/diffs

commit 8ce40db4128ec86cec2cae25261bcb5d48a921cc
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Oct 4 10:34:09 2011 +0200

    [1251] More TTL tweaks
    
    These are just tests and logging messages.

-----------------------------------------------------------------------

Summary of changes:
 src/lib/python/isc/xfrin/libxfrin_messages.mes |    7 +++----
 src/lib/python/isc/xfrin/tests/diff_tests.py   |    7 +++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/xfrin/libxfrin_messages.mes b/src/lib/python/isc/xfrin/libxfrin_messages.mes
index 8bfb7b1..be943c8 100644
--- a/src/lib/python/isc/xfrin/libxfrin_messages.mes
+++ b/src/lib/python/isc/xfrin/libxfrin_messages.mes
@@ -15,8 +15,7 @@
 # No namespace declaration - these constants go in the global namespace
 # of the libxfrin_messages python module.
 
-% LIBXFRIN_DIFFERENT_TTL multiple data with different TTLs (%1, %2) on %3/%4
+% LIBXFRIN_DIFFERENT_TTL multiple data with different TTLs (%1, %2) on %3/%4. Adjusting %2 -> %1.
 The xfrin module received an update containing multiple rdata changes for the
-same RRset. But the TTLs of these don't match each other. The data will be put
-into the underlying data source. What happens with the TTLs is up to the
-data source.
+same RRset. But the TTLs of these don't match each other. As we combine them
+together, the later one get's overwritten to the earlier one in the sequence.
diff --git a/src/lib/python/isc/xfrin/tests/diff_tests.py b/src/lib/python/isc/xfrin/tests/diff_tests.py
index d431f42..9652a1a 100644
--- a/src/lib/python/isc/xfrin/tests/diff_tests.py
+++ b/src/lib/python/isc/xfrin/tests/diff_tests.py
@@ -418,9 +418,16 @@ class DiffTest(unittest.TestCase):
                                   self.__type, RRTTL(120))
             rrset2.add_rdata(Rdata(self.__type, self.__rrclass, '192.10.2.2'))
             diff.add_data(rrset2)
+            rrset2 = RRset(Name('a.example.org.'), self.__rrclass,
+                                  self.__type, RRTTL(6000))
+            rrset2.add_rdata(Rdata(self.__type, self.__rrclass, '192.10.2.3'))
+            diff.add_data(rrset2)
             # They should get compacted together and complain.
             diff.compact()
             self.assertEqual(1, len(diff.get_buffer()))
+            # The TTL stays on the first value, no matter if smaller or bigger
+            # ones come later.
+            self.assertEqual(self.__ttl, diff.get_buffer()[0][1].get_ttl())
             self.assertTrue(self.__warn_called)
         finally:
             isc.xfrin.diff.logger = orig_logger