Commit 1c5274dc authored by Razvan Becheriu's avatar Razvan Becheriu Committed by Tomek Mrugalski
Browse files

fixed merge

parent 915f205f
......@@ -511,6 +511,16 @@ TEST_F(CqlHostDataSourceTest, testAddRollback) {
DbOperationError);
}
TEST_F(CqlHostDataSourceTest, DISABLED_stressTest) {
// Run with 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4092, 8192,
// 16384 & 32768 hosts.
for (unsigned int i = 0X0001U; i < 0xfffdU; i <<= 1) {
initializeTest();
stressTest(i);
destroyTest();
}
}
// This test checks that siaddr, sname, file fields can be retrieved
/// from a database for a host.
/// @todo: Uncomment this after 5507 is implemented.
......
......@@ -226,7 +226,7 @@ CREATE INDEX IF NOT EXISTS host_reservationsindex5 ON host_reservations (host_ip
CREATE INDEX IF NOT EXISTS host_reservationsindex6 ON host_reservations (reserved_ipv6_prefix_address);
CREATE INDEX IF NOT EXISTS host_reservationsindex7 ON host_reservations (reserved_ipv6_prefix_length);
TRUNCATE SCHEMA_VERSION;
DELETE FROM schema_version WHERE version=1;
INSERT INTO schema_version (version, minor) VALUES(2, 0);
-- This line concludes database upgrade to version 2.0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment