From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 4 Apr 2012 21:38:14 +0000 (-0700)
Subject: [master] Merge branch 'trac324new2' with fixing conflict for
X-Git-Tag: trac2351_base~226^2~116^2~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8644866497053f91ada4e99abe444d7876ed00ff;p=thirdparty%2Fkea.git

[master] Merge branch 'trac324new2' with fixing conflict for
	src/lib/python/isc/notify/tests/testdata/test.sqlite3
---

8644866497053f91ada4e99abe444d7876ed00ff
diff --cc src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
index 46b1411af3,f421f7ec32..6a58c9462e
--- a/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
+++ b/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
@@@ -1295,19 -1299,6 +1316,6 @@@ TEST_F(SQLite3Update, addDiffWithUpdate
      expected_stored.push_back(diff_end_data);
      expected_stored.push_back(diff_add_a_data);
  
 -    checkDiffs(expected_stored, accessor->getRecordDiff(zone_id));
 +    checkDiffs(expected_stored, accessor->getDiffs(zone_id, 1234, 1300));
  }
- 
- TEST_F(SQLite3Update, addDiffWithNoTable) {
-     // An attempt of adding diffs to an old version of database that doesn't
-     // have a diffs table.  This will fail in preparing the statement.
-     initAccessor(SQLITE_DBFILE_EXAMPLE + ".nodiffs", "IN");
-     zone_id = accessor->startUpdateZone("example.com.", false).second;
-     copy(diff_begin_data, diff_begin_data + DatabaseAccessor::DIFF_PARAM_COUNT,
-          diff_params);
-     EXPECT_THROW(accessor->addRecordDiff(zone_id, getVersion(diff_begin_data),
-                                          getOperation(diff_begin_data),
-                                          diff_params),
-                  SQLite3Error);
- }
  } // end anonymous namespace
diff --cc src/lib/python/isc/notify/tests/testdata/test.sqlite3
index 16060640ce,7617d4f3f0..d659181815
Binary files differ