fixed tests when there are no testing nodes

royaflash · Aug 16, 2019 · 0deaa9d · 0deaa9d
1 parent c739c9d
commit 0deaa9d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/t/kvm/n10_nodes.t b/t/kvm/n10_nodes.t
@@ -1146,7 +1146,7 @@ SKIP: {
         $vm = undef;
     } else {
         $node = remote_node($vm_name);
-        $node = test_node($vm_name, $node);
+        $node = test_node($vm_name, $node) if $node;
         $vm = undef if !$node;
     }
 

diff --git a/t/nodes/60_hardware.t b/t/nodes/60_hardware.t
@@ -67,14 +67,18 @@ for my $vm_name ( 'Void', 'KVM') {
             $vm = undef;
         }
 
-        diag($msg)      if !$vm;
-        skip($msg,10)   if !$vm;
 
-        diag("Testing remote node in $vm_name");
         my ($node1,$node2) = remote_node_2($vm_name);
 
-        ok($node2,"Expecting at least 2 nodes configured to test") or next;
+        if ( !$node2 ) {
+            $msg = "Expecting at least 2 nodes configured to test";
+            $vm = undef;
+        }
+        diag($msg)      if !$vm;
+        skip($msg,10)   if !$vm;
 
+
+        diag("Testing remote node in $vm_name");
         clean_remote_node($node1);
         clean_remote_node($node2)   if $node2;