Refs #35505 - ISS Syncable imports (#865)

Katello · Sep 21, 2022 · 8fb71dd · 8fb71dd
1 parent 6a47ac3
commit 8fb71dd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/lib/hammer_cli_katello/content_export.rb b/lib/hammer_cli_katello/content_export.rb
@@ -78,7 +78,7 @@ def execute
         end
 
         make_listing_files(export_history)
-
+        output.print_message _("Generated #{export_history['path']}")
         HammerCLI::EX_OK
       end
     end

diff --git a/lib/hammer_cli_katello/content_export_helper.rb b/lib/hammer_cli_katello/content_export_helper.rb
@@ -14,10 +14,9 @@ def execute
         response
       else
         export_history = fetch_export_history_from_task(reload_task(@task))
-        if syncable?
-          make_listing_files(export_history)
-          HammerCLI::EX_OK
-        elsif export_history
+
+        if export_history
+          make_listing_files(export_history) if syncable?
           generate_metadata_json(export_history)
           HammerCLI::EX_OK
         else
@@ -82,8 +81,6 @@ def check_export_history_syncable!(export_history)
 
     def make_listing_files(export_history)
       check_export_history_syncable!(export_history)
-      output.print_message _("Generated #{export_history['path']}")
-
       return unless Dir.exist?("#{export_history['path']}/content")
 
       begin

diff --git a/test/data/4.7/foreman_api.json b/test/data/4.7/foreman_api.json
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -17,7 +17,7 @@
 require 'mocha/minitest'
 require 'hammer_cli'
 
-KATELLO_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '4.6')
+KATELLO_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '4.7')
 
 if HammerCLI.context[:api_connection]
   HammerCLI.context[:api_connection].create('foreman') do
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,7 +78,7 @@ def execute @@
             end
             make_listing_files(export_history)
+            output.print_message _("Generated #{export_history['path']}")
             HammerCLI::EX_OK
           end
         end
@@ Expand Down @@