Use @test_broken instead of skipping

This also fixes one failure in L-BFGS that causes CI to fail.
JuliaNLSolvers · Oct 25, 2024 · 5d1f90d · 5d1f90d
1 parent 0a04aa0
commit 5d1f90d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/test/multivariate/solvers/first_order/cg.jl b/test/multivariate/solvers/first_order/cg.jl
@@ -6,12 +6,10 @@
     run_optim_tests(ConjugateGradient(),
                     skip=skip,
                     convergence_exceptions = (("Powell", 1), ("Powell", 2), ("Polynomial", 1),
-                                              ("Extended Rosenbrock", 1),
                                               ("Extended Powell", 1),
                                               ("Extended Powell", 2)),
                     minimum_exceptions = (("Paraboloid Diagonal", 1)),
-                    minimizer_exceptions = (("Paraboloid Diagonal", 1),
-                                            ("Extended Powell", 1),
+                    minimizer_exceptions = (("Extended Powell", 1),
                                             ("Extended Powell", 2)),
                     f_increase_exceptions = (("Hosaki"),),
                     iteration_exceptions = (("Paraboloid Diagonal", 10000),),

diff --git a/test/multivariate/solvers/first_order/l_bfgs.jl b/test/multivariate/solvers/first_order/l_bfgs.jl
@@ -2,11 +2,7 @@
     # Trigonometric gets stuck in a local minimum?
     skip = ("Trigonometric",)
 
-    if Sys.WORD_SIZE == 32
-        iteration_exceptions = (("Extended Powell", 2000),)
-    else
-        iteration_exceptions = ()
-    end
+    iteration_exceptions = (("Extended Powell", 2000),)
 
     run_optim_tests(LBFGS(),
                     f_increase_exceptions = ("Extended Rosenbrock",),

diff --git a/test/multivariate/solvers/first_order/momentum_gradient_descent.jl b/test/multivariate/solvers/first_order/momentum_gradient_descent.jl
@@ -4,10 +4,7 @@
             "Trigonometric", "Penalty Function I", "Beale","Paraboloid Random Matrix")
     run_optim_tests(MomentumGradientDescent(),
                     skip = skip,
-                    convergence_exceptions = (("Large Polynomial",1),  ("Himmelblau",1),
-                                              ("Fletcher-Powell", 1),("Fletcher-Powell", 2),
-                                              ("Powell", 1)),
-                    minimum_exceptions = (("Large Polynomial", 1), ("Large Polynomial", 2)),
+                    convergence_exceptions = (("Fletcher-Powell", 2),),
                     iteration_exceptions = (("Paraboloid Diagonal", 10000),
                                             ("Powell", 10000)),
                     f_increase_exceptions = ("Exponential", "Polynomial",

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -155,15 +155,22 @@ function run_optim_tests(method; convergence_exceptions = (),
                         printstyled(name, " did not converge with i = ", i, "\n", color=:red)
                         printstyled(results, "\n", color=:red)
                     end
+                else
+                    @test_broken Optim.converged(results)
                 end
                 if !((name, i) in minimum_exceptions)
                     @test Optim.minimum(results) < prob.minimum + sqrt(eps(typeof(prob.minimum)))
+                else
+                    @test_broken Optim.minimum(results) < prob.minimum + sqrt(eps(typeof(prob.minimum)))
                 end
                 if !((name, i) in minimizer_exceptions)
                     @test norm(Optim.minimizer(results) - prob.solutions) < 1e-2
+                else
+                    @test_broken norm(Optim.minimizer(results) - prob.solutions) < 1e-2
                 end
             end
         else
+            @test_broken false    # marked skipped tests as broken
             debug_printing && printstyled("Skipping $name\n", color=:blue)
         end
     end
@@ -216,14 +223,21 @@ function run_optim_tests_constrained(method; convergence_exceptions = (),
                     printstyled(name, "did not converge\n", color=:red)
                     printstyled(results, "\n", color=:red)
                 end
+            else
+                @test_broken Optim.converged(results)
             end
             if !(name in minimum_exceptions)
                 @test Optim.minimum(results) < prob.minimum + sqrt(eps(typeof(prob.minimum)))
+            else
+                @test_broken Optim.minimum(results) < prob.minimum + sqrt(eps(typeof(prob.minimum)))
             end
             if !(name in minimizer_exceptions)
                 @test norm(Optim.minimizer(results) - prob.solutions) < 1e-2
+            else
+                @test_broken norm(Optim.minimizer(results) - prob.solutions) < 1e-2
             end
         else
+            @test_broken false
             debug_printing && printstyled("Skipping $name\n", color=:blue)
         end
     end