lib/autoproj/cli/test.rb in autoproj-2.0.0.rc37 vs lib/autoproj/cli/test.rb in autoproj-2.0.0.rc38

@@ -10,11 +10,11 @@
                 else
                     initialize_and_load
                     selection, _ = finalize_setup(
                         user_selection,
                         recursive: options[:deps],
-                        ignore_non_imported_packages: true)
+                        non_imported_packages: :return)
                     ws.config.utility_enable('test', *selection)
                 end
                 ws.config.save
             end
 
@@ -25,26 +25,26 @@
                 else
                     initialize_and_load
                     selection, _ = finalize_setup(
                         user_selection,
                         recursive: options[:deps],
-                        ignore_non_imported_packages: true)
+                        non_imported_packages: :return)
                     ws.config.utility_disable('test', *selection)
                 end
                 ws.config.save
             end
 
             def list(user_selection, options = Hash.new)
                 initialize_and_load
                 resolved_selection, _ = finalize_setup(
                     user_selection,
-                    recursive: options[:dep],
-                    ignore_non_imported_packages: true)
+                    recursive: options[:deps],
+                    non_imported_packages: :return)
 
                 lines = Array.new
                 resolved_selection.each do |pkg_name|
-                    pkg = ws.manifest.find_package(pkg_name).autobuild
+                    pkg = ws.manifest.find_package_definition(pkg_name).autobuild
                     lines << [pkg.name, pkg.test_utility.enabled?, pkg.test_utility.available?]
                 end
                 lines = lines.sort_by { |name, _| name }
                 w     = lines.map { |name, _| name.length }.max
                 format = "%-#{w}s %-7s %-9s"
@@ -54,10 +54,11 @@
                 end
             end
 
             def run(user_selection, options = Hash.new)
                 initialize_and_load
-                packages, _ = finalize_setup(user_selection)
+                packages, _ = finalize_setup(user_selection,
+                                             recursive: options[:deps])
 
                 packages.each do |pkg|
                     Autobuild::Package[pkg].disable_phases('import', 'prepare', 'install')
                 end
                 Autobuild.apply(packages, "autoproj-test", ['test'])