Skip to content

Commit 70bab5e

Browse files
committed
[#89,!22] Fixed mysql unittests.
1 parent 1cffada commit 70bab5e

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/bin/admin/tests/mysql_tests.sh.in

+5-4
Original file line numberDiff line numberDiff line change
@@ -518,13 +518,13 @@ EOF
518518
assert_eq 0 $ERRCODE "dhcp4_option_def_server table missing or broken (expected status code %d, returned %d)";
519519

520520
# table: dhcp4_shared_network
521-
qry="select name, client_class, interface, match_client_id, modification_ts, rebind_timer, relay, renew_timer, require_client_classes, reservation_mode, server_hostname, user_context, valid_lifetime from dhcp4_shared_network";
521+
qry="select id, name, client_class, interface, match_client_id, modification_ts, rebind_timer, relay, renew_timer, require_client_classes, reservation_mode, server_hostname, user_context, valid_lifetime from dhcp4_shared_network";
522522
count=`mysql_execute "${qry}"`
523523
ERRCODE=$?
524524
assert_eq 0 $ERRCODE "dhcp4_shared_network table missing or broken (expected status code %d, returned %d)";
525525

526526
# table: dhcp4_shared_network_server
527-
qry="select shared_network_name, server_id, modification_ts from dhcp4_shared_network_server";
527+
qry="select shared_network_id, server_id, modification_ts from dhcp4_shared_network_server";
528528
count=`mysql_execute "${qry}"`
529529
ERRCODE=$?
530530
assert_eq 0 $ERRCODE "dhcp4_shared_network_server table missing or broken (expected status code %d, returned %d)";
@@ -595,12 +595,13 @@ EOF
595595
assert_eq 0 $ERRCODE "dhcp6_option_def_server table missing or broken (expected status code %d, returned %d)";
596596

597597
# table: dhcp6_shared_network
598-
qry="select name, client_class, interface, modification_ts, preferred_lifetime, rapid_commit, rebind_timer, relay, renew_timer, require_client_classes, reservation_mode, server_hostname, user_context, valid_lifetime from dhcp6_shared_network";
598+
qry="select id, name, client_class, interface, modification_ts, preferred_lifetime, rapid_commit, rebind_timer, relay, renew_timer, require_client_classes, reservation_mode, server_hostname, user_context, valid_lifetime from dhcp6_shared_network";
599599
count=`mysql_execute "${qry}"`
600600
ERRCODE=$?
601601
assert_eq 0 $ERRCODE "dhcp6_shared_network table missing or broken (expected status code %d, returned %d)";
602+
602603
# table: dhcp6_shared_network_server
603-
qry="select shared_network_name, server_id, modification_ts from dhcp6_shared_network_server";
604+
qry="select shared_network_id, server_id, modification_ts from dhcp6_shared_network_server";
604605
count=`mysql_execute "${qry}"`
605606
ERRCODE=$?
606607
assert_eq 0 $ERRCODE "dhcp6_shared_network_server table missing or broken (expected status code %d, returned %d)";

0 commit comments

Comments
 (0)