Merge pull request #457 from cPholloway/RE-475

Teach wait_for_leapp_completion() about the no-leapp option

elevate-cpanel

@@ -6081,6 +6081,9 @@ EOS
     }
 
     sub wait_for_leapp_completion ($self) {
+
+        return 1 unless $self->cpev->should_run_leapp();
+
         my $upgrade_log = LEAPP_UPGRADE_LOG;
 
         if ( !-e $upgrade_log ) {

lib/Elevate/Leapp.pm

@@ -242,6 +242,10 @@ sub extract_error_block_from_output ( $self, $text_ar ) {
 # Returns 0 on failure.
 
 sub wait_for_leapp_completion ($self) {
+
+    # No use waiting for leapp to complete if we did not run leapp
+    return 1 unless $self->cpev->should_run_leapp();
+
     my $upgrade_log = LEAPP_UPGRADE_LOG;
 
     if ( !-e $upgrade_log ) {

t/leapp_upgrade.t

@@ -313,6 +313,16 @@ note 'LEAPP upgrade log failure checks';
 {
     $mock_leapp_upgrade_log->unlink;
 
+    $mock_elevate->redefine(
+        should_run_leapp => 0,
+    );
+
+    is( cpev->leapp->wait_for_leapp_completion, 1, 'wait_for_leapp_completion returns early when it should NOT run leapp' );
+
+    $mock_elevate->redefine(
+        should_run_leapp => 1,
+    );
+
     is( cpev->leapp->wait_for_leapp_completion, 0, "wait_for_leapp_completion fails when the upgrade log is missing." );
 
     $mock_leapp_upgrade_log->contents("magic string is missing");