Improved local and default networks tests

UPC · Jun 2, 2017 · f8911dd · f8911dd
1 parent cbdcf69
commit f8911dd
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 4 deletions.
diff --git a/sql/data/insert_networks.sql b/sql/data/insert_networks.sql
@@ -1,5 +1,5 @@
 insert into networks (name, address,n_order, all_domains,requires_password)
-    VALUES ('localnet', '127.0.0.0/24',1,1,0);
+    VALUES ('localnet', '127.0.0.0/8',1,1,0);
 insert into networks (name, address,n_order, all_domains,requires_password)
     VALUES ('default', '0.0.0.0/0',99,1,1);
 
diff --git a/sql/mysql/networks.sql b/sql/mysql/networks.sql
@@ -7,5 +7,7 @@ CREATE TABLE `networks` (
   `no_domains` int(11) DEFAULT '0',
   `requires_password` int(11) DEFAULT '0',
   `n_order` int(11) DEFAULT '0',
+  unique('address'),
+  unique('name'),
   PRIMARY KEY (`id`)
 );
diff --git a/sql/sqlite/networks.sql b/sql/sqlite/networks.sql
@@ -7,4 +7,5 @@ CREATE TABLE `networks` (
 ,  `no_domains` integer DEFAULT '0'
 ,  `requires_password` integer DEFAULT '0'
 ,  `n_order` integer DEFAULT '0'
+,  unique('address')
 );
diff --git a/t/kvm/p10_password.t b/t/kvm/p10_password.t
@@ -162,7 +162,7 @@ sub test_any_network_password {
     $domain->start(user => $USER, remote_ip => '127.0.0.1');
 
     my $password = $domain->spice_password();
-    is($password, undef ,"Expecting no password, got '".($password or '')."'");
+    is($password, undef ,"Expecting no password, got '".($password or '')."'") or exit;
     $domain->shutdown_now($USER);
 
     $domain->start(user => $USER, remote_ip => '10.0.0.1');
@@ -236,6 +236,10 @@ sub add_network_10 {
     $requires_password = 1 if !defined $requires_password;
 
     my $sth = $test->connector->dbh->prepare(
+        "DELETE FROM networks where address='10.0.0.0/24'"
+    );
+    $sth->execute;
+    $sth = $test->connector->dbh->prepare(
         "INSERT INTO networks (name,address,all_domains,requires_password)"
         ."VALUES('10','10.0.0.0/24',1,?)"
     );
@@ -247,8 +251,13 @@ sub add_network_any {
     $requires_password = 1 if !defined $requires_password;
 
     my $sth = $test->connector->dbh->prepare(
-        "INSERT INTO networks (name,address,all_domains,requires_password)"
-        ."VALUES('any','0.0.0.0/0',1,?)"
+        "DELETE FROM networks where address='0.0.0.0/0'"
+    );
+    $sth->execute;
+
+    $sth = $test->connector->dbh->prepare(
+        "INSERT INTO networks (name,address,all_domains,requires_password,n_order)"
+        ."VALUES('any','0.0.0.0/0',1,?,999)"
     );
     $sth->execute($requires_password);
 }
@@ -261,6 +270,15 @@ sub remove_network_10 {
 
 }
 
+sub remove_network_default {
+    my $sth = $test->connector->dbh->prepare(
+        "DELETE FROM networks where name='default'"
+    );
+    $sth->execute();
+
+}
+
+
 #######################################################
 
 clean();
@@ -286,6 +304,13 @@ SKIP: {
 
     $domain1->start(user => $USER, remote_ip => '10.0.0.1');
     my $password = $domain1->spice_password();
+    ok($password,"Expecting password, got : '".($password or '')."'");
+
+    remove_network_default();
+    $domain1->shutdown_now($USER);
+    $domain1->start(user => $USER, remote_ip => '10.0.0.1');
+    $password = $domain1->spice_password();
+
     is($password,undef,"Expecting no password, got : '".($password or '')."'");
     $domain1->shutdown_now($USER)   if $domain1->is_active;