Skip to content

Commit 7ad143c

Browse files
authored
Merge pull request #3862 from mrmundt/ipopt-test-bug
IPOPT test bug: version checking incorrect
2 parents bdb22dd + 38edf2c commit 7ad143c

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

pyomo/contrib/solver/tests/solvers/test_ipopt.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@
1212
import stat
1313
import subprocess
1414
import sys
15-
import time
16-
import threading
1715
from contextlib import contextmanager
1816

1917
import pyomo.environ as pyo
20-
from pyomo.common.envvar import is_windows
2118
from pyomo.common.fileutils import ExecutableData
2219
from pyomo.common.config import ConfigDict, ADVANCED_OPTION
2320
from pyomo.common.errors import ApplicationError, MouseTrap
@@ -1977,7 +1974,7 @@ def test_ipopt_timer_object(self):
19771974
ipopt_instance = ipopt.Ipopt()
19781975
results = ipopt_instance.solve(model)
19791976
timing_info = results.timing_info
1980-
if ipopt_instance.version()[0:1] <= (3, 13):
1977+
if ipopt_instance.version()[:2] <= (3, 13):
19811978
# We are running an older version of IPOPT (<= 3.13)
19821979
self.assertIn('IPOPT (w/o function evaluations)', timing_info.keys())
19831980
self.assertIn('NLP function evaluations', timing_info.keys())

0 commit comments

Comments
 (0)