Python: Cleanup; drop empty first 'tool' argument

HenrikBengtsson · Jun 21, 2023 · ca0df89 · ca0df89
1 parent 58bde46
commit ca0df89
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/python/tests/test_port4me.py b/python/tests/test_port4me.py
@@ -2,7 +2,7 @@
 from os import environ
 
 def test_alice():
-    assert port4me('', user='alice') == 30845
+    assert port4me(user='alice') == 30845
 
 
 def test_alice_env():
@@ -12,73 +12,77 @@ def test_alice_env():
 
 
 def test_alice_list_one():
-    assert port4me('', user='alice', list=1) == [30845]
+    assert port4me(user='alice', list=1) == [30845]
 
 
 def test_alice_list_five():
-    assert port4me('', user='alice', list=5) == [30845, 19654, 32310, 63992, 15273]
+    assert port4me(user='alice', list=5) == [30845, 19654, 32310, 63992, 15273]
 
 
 def test_alice_list_five_env():
     environ['PORT4ME_LIST'] = '5'
-    assert port4me('', user='alice') == [30845, 19654, 32310, 63992, 15273]
+    assert port4me(user='alice') == [30845, 19654, 32310, 63992, 15273]
     environ.pop('PORT4ME_LIST')
 
 
 def test_alice_tool():
+    assert port4me(tool='jupyter-notebook', user='alice') == 29525
+
+
+def test_alice_tool_noname():
     assert port4me('jupyter-notebook', user='alice') == 29525
 
 
 def test_alice_tool_env():
     environ['PORT4ME_TOOL'] = 'jupyter-notebook'
-    assert port4me('', user='alice') == 29525
+    assert port4me(user='alice') == 29525
     environ.pop('PORT4ME_TOOL')
 
 
 def test_alice_skip():
-    assert port4me('', user='alice', list=3, skip=2) == [32310, 63992, 15273]
+    assert port4me(user='alice', list=3, skip=2) == [32310, 63992, 15273]
 
 
 def test_alice_skip_env():
     environ['PORT4ME_SKIP'] = '2'
-    assert port4me('', user='alice', list=3) == [32310, 63992, 15273]
+    assert port4me(user='alice', list=3) == [32310, 63992, 15273]
     environ.pop('PORT4ME_SKIP')
 
 
 def test_alice_exclude():
-    assert port4me('', user='alice', exclude=[30845, 32310]) == 19654
+    assert port4me(user='alice', exclude=[30845, 32310]) == 19654
 
 
 def test_alice_exclude_env():
     environ['PORT4ME_EXCLUDE'] = '30845,32310'
-    assert port4me('', user='alice') == 19654
+    assert port4me(user='alice') == 19654
     environ.pop('PORT4ME_EXCLUDE')
 
 
 def test_alice_exclude():
-    assert port4me('', user='alice', include=list(range(2000, 2123+1)) + [4321] + list(range(10000, 10999+1))) == 10451
+    assert port4me(user='alice', include=list(range(2000, 2123+1)) + [4321] + list(range(10000, 10999+1))) == 10451
 
 
 def test_alice_include_env():
     include = list(range(2000, 2123+1)) + [4321] + list(range(10000, 10999+1))
     environ['PORT4ME_INCLUDE'] = ','.join(map(str, include))
-    assert port4me('', user='alice') == 10451
+    assert port4me(user='alice') == 10451
     environ.pop('PORT4ME_INCLUDE')
 
 
 def test_alice_prepend():
-    assert port4me('', user='alice', list=5, prepend=[4321, 11001]) == [4321, 11001, 30845, 19654, 32310]
+    assert port4me(user='alice', list=5, prepend=[4321, 11001]) == [4321, 11001, 30845, 19654, 32310]
 
 
 def test_alice_prepend_env():
     environ['PORT4ME_PREPEND'] = '4321,11001'
-    assert port4me('', user='alice', list=5) == [4321, 11001, 30845, 19654, 32310]
+    assert port4me(user='alice', list=5) == [4321, 11001, 30845, 19654, 32310]
     environ.pop('PORT4ME_PREPEND')
 
 
 def test_bob():
-    assert port4me('', user='bob', list=5) == [54242, 4930, 42139, 14723, 55707]
+    assert port4me(user='bob', list=5) == [54242, 4930, 42139, 14723, 55707]
 
 
 def test_bob_skip_exclude():
-    assert port4me('', user='bob', list=2, skip=1, exclude=[54242, 14723]) == [42139, 55707]
+    assert port4me(user='bob', list=2, skip=1, exclude=[54242, 14723]) == [42139, 55707]