Skip to content

Commit

Permalink
Run black again
Browse files Browse the repository at this point in the history
  • Loading branch information
Eslick authored and Eslick committed Apr 4, 2024
1 parent d4c9ddf commit 4849ec5
Showing 1 changed file with 5 additions and 18 deletions.
23 changes: 5 additions & 18 deletions pyomo/solvers/tests/checks/test_amplfunc_merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,30 +107,21 @@ def test_merge_no_dup(self):
self.assertEqual(sm_list[2], "my/place/l2.so")

def test_merge_empty1(self):
env = {
"AMPLFUNC": "",
"PYOMO_AMPLFUNC": "my/place/l2.so",
}
env = {"AMPLFUNC": "", "PYOMO_AMPLFUNC": "my/place/l2.so"}
sm = amplfunc_merge(env)
sm_list = sm.split("\n")
self.assertEqual(len(sm_list), 1)
self.assertEqual(sm_list[0], "my/place/l2.so")

def test_merge_empty2(self):
env = {
"AMPLFUNC": "my/place/l2.so",
"PYOMO_AMPLFUNC": "",
}
env = {"AMPLFUNC": "my/place/l2.so", "PYOMO_AMPLFUNC": ""}
sm = amplfunc_merge(env)
sm_list = sm.split("\n")
self.assertEqual(len(sm_list), 1)
self.assertEqual(sm_list[0], "my/place/l2.so")

def test_merge_empty_both(self):
env = {
"AMPLFUNC": "",
"PYOMO_AMPLFUNC": "",
}
env = {"AMPLFUNC": "", "PYOMO_AMPLFUNC": ""}
sm = amplfunc_merge(env)
sm_list = sm.split("\n")
self.assertEqual(len(sm_list), 1)
Expand All @@ -148,19 +139,15 @@ def test_merge_duplicate1(self):
self.assertEqual(sm_list[1], "another/place/l1.so")

def test_merge_no_pyomo(self):
env = {
"AMPLFUNC": "my/place/l1.so\nanother/place/l1.so",
}
env = {"AMPLFUNC": "my/place/l1.so\nanother/place/l1.so"}
sm = amplfunc_merge(env)
sm_list = sm.split("\n")
self.assertEqual(len(sm_list), 2)
self.assertEqual(sm_list[0], "my/place/l1.so")
self.assertEqual(sm_list[1], "another/place/l1.so")

def test_merge_no_user(self):
env = {
"PYOMO_AMPLFUNC": "my/place/l1.so\nanother/place/l1.so",
}
env = {"PYOMO_AMPLFUNC": "my/place/l1.so\nanother/place/l1.so"}
sm = amplfunc_merge(env)
sm_list = sm.split("\n")
self.assertEqual(len(sm_list), 2)
Expand Down

0 comments on commit 4849ec5

Please sign in to comment.