Commit 5c5be9a7 authored by Francesc Guasch's avatar Francesc Guasch
Browse files

Merge branch 'develop' of https://github.com/UPC/ravada into develop

parents 7e6c8e25 a8c7ff94
......@@ -1093,8 +1093,8 @@ sub _upgrade_table {
&& $new_size
&& $new_size != $row->{COLUMN_SIZE}) {
$dbh->do("alter table $table change $field $field $definition");
warn "INFO: changing $field $row->{COLUMN_SIZE} to $new_size in $table\n" if $0 !~ /\.t$/;
$dbh->do("alter table $table change $field $field $definition");
return;
}
......
......@@ -6,4 +6,4 @@ CREATE TABLE `grant_types` (
UNIQUE(`name`),
UNIQUE(`description`),
PRIMARY KEY (`id`)
);
) CHARACTER SET 'utf8';
......@@ -9,5 +9,6 @@ CREATE TABLE `users` (
`language` char(3) DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`)
);
)
CHARACTER SET 'utf8';
......@@ -8,4 +8,4 @@ create table volumes (
PRIMARY KEY (`id`),
UNIQUE (`id_domain`,`name`),
UNIQUE (`id_domain`,`n_order`)
);
)CHARACTER SET 'utf8';
......@@ -4,5 +4,4 @@ CREATE TABLE `grant_types` (
, `description` varchar(255) NOT NULL
, `enabled` integer default NULL
, UNIQUE(`name`)
, UNIQUE(`description`)
);
......@@ -979,6 +979,12 @@ sub start_node($node) {
is($connect,1
,"[".$node->type."] "
.$node->name." Expecting connection") or exit;
for ( 1 .. 60 ) {
$domain = _domain_node($node);
last if $domain->ip;
sleep 1;
diag("Waiting for connection to node ".$node->name." $_") if !($_ % 5);
}
$node->is_active(1);
$node->is_enabled(1);
......
......@@ -46,10 +46,10 @@ sub test_one_port($vm) {
is($@,'',"[".$vm->type."] export port $internal_port");
my $port_info_no = $domain->exposed_port(456);
is(!$port_info_no);
is($port_info_no,undef);
$port_info_no = $domain->exposed_port('no');
is(!$port_info_no);
is($port_info_no,undef);
my $port_info = $domain->exposed_port($name_port);
ok($port_info) && do {
......
Supports Markdown
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