[tests] black -t py34

tests/__init__.py

@@ -1,4 +1,3 @@
 import bumblebee_status.discover
 
 bumblebee_status.discover.discover()
-

tests/core/test_config.py

@@ -3,17 +3,20 @@
 
 import core.config
 
+
 @pytest.fixture
 def defaultConfig():
     return core.config.Config([])
 
+
 def test_module():
     modules = ["module-1", "module-2", "module-3"]
 
     cfg = core.config.Config(["-m"] + modules)
 
     assert cfg.modules() == modules
 
+
 def test_module_ordering_maintained():
     modules = ["module-1", "module-5", "module-7"]
     more_modules = ["module-0", "module-2", "aaa"]
@@ -22,44 +25,53 @@ def test_module_ordering_maintained():
 
     assert cfg.modules() == modules + more_modules
 
+
 def test_default_interval(defaultConfig):
     assert defaultConfig.interval() == 1
 
+
 def test_interval():
     interval = 4
     cfg = core.config.Config(["-p", "interval={}".format(interval)])
 
     assert cfg.interval() == interval
 
+
 def test_floating_interval():
     interval = 4.5
     cfg = core.config.Config(["-p", "interval={}".format(interval)])
 
     assert cfg.interval() == interval
 
+
 def test_default_theme(defaultConfig):
     assert defaultConfig.theme() == "default"
 
+
 def test_theme():
     theme_name = "sample-theme"
     cfg = core.config.Config(["-t", theme_name])
     assert cfg.theme() == theme_name
 
+
 def test_default_iconset(defaultConfig):
     assert defaultConfig.iconset() == "auto"
 
+
 def test_iconset():
     iconset_name = "random-iconset"
     cfg = core.config.Config(["-i", iconset_name])
     assert cfg.iconset() == iconset_name
 
+
 def test_reverse(defaultConfig):
     assert defaultConfig.reverse() == False
 
     cfg = core.config.Config(["-r"])
 
     assert cfg.reverse() == True
 
+
 def test_logfile(defaultConfig):
     assert defaultConfig.logfile() is None
 
@@ -68,7 +80,6 @@ def test_logfile(defaultConfig):
     assert cfg.logfile() == logfile
 
 
-
 def test_all_modules():
     modules = core.config.all_modules()
     assert len(modules) > 0
@@ -84,19 +95,24 @@ def test_all_modules():
                 "modules",
             )
         )
-    assert os.path.exists(os.path.join(base, "contrib", pyname)) \
-        or os.path.exists(os.path.join(base, "core", pyname))
+    assert os.path.exists(os.path.join(base, "contrib", pyname)) or os.path.exists(
+        os.path.join(base, "core", pyname)
+    )
+
 
 def test_list_output(mocker):
     mocker.patch("core.config.sys")
     cfg = core.config.Config(["-l", "themes"])
     cfg = core.config.Config(["-l", "modules"])
     cfg = core.config.Config(["-l", "modules-rst"])
 
+
 def test_missing_parameter():
     cfg = core.config.Config(["-p", "test.key"])
 
     assert cfg.get("test.key") == None
     assert cfg.get("test.key", "no-value-set") == "no-value-set"
+
+
 #
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

tests/core/test_decorators.py

@@ -5,6 +5,7 @@
 import core.module
 import core.config
 
+
 @pytest.fixture
 def module():
     class TestModule(core.module.Module):
@@ -17,28 +18,34 @@ def __init__(self, config=None, theme=None):
         @core.decorators.scrollable
         def get(self, widget):
             return self.text
+
     module = TestModule()
     module.set("scrolling.width", 10)
     return module
 
+
 def test_never(module):
     assert module.parameter("interval") == "never"
 
+
 def test_no_text(module):
     assert module.text == ""
     assert module.get(module.widget()) == ""
 
+
 def test_smaller(module):
     module.text = "test"
     assert module.parameter("scrolling.width") > len(module.text)
     assert module.get(module.widget()) == module.text
 
+
 def test_bigger(module):
     module.text = "this is a really really long sample text"
     maxwidth = module.parameter("scrolling.width")
     assert maxwidth < len(module.text)
     assert module.get(module.widget()) == module.text[:maxwidth]
 
+
 def test_bounce(module):
     module.text = "abcd"
     module.set("scrolling.width", 2)
@@ -52,6 +59,7 @@ def test_bounce(module):
     assert module.get(module.widget()) == "bc"
     assert module.get(module.widget()) == "ab"
 
+
 def test_nobounce(module):
     module.set("scrolling.bounce", False)
     module.set("scrolling.width", 2)
@@ -64,6 +72,7 @@ def test_nobounce(module):
     assert module.get(module.widget()) == "bc"
     assert module.get(module.widget()) == "cd"
 
+
 def test_completely_changed_data(module):
     module.text = "abcd"
     module.set("scrolling.width", 2)
@@ -75,6 +84,7 @@ def test_completely_changed_data(module):
     assert module.get(module.widget()) == "wx"
     assert module.get(module.widget()) == "xy"
 
+
 def test_slightly_changed_data(module):
     module.text = "this is a sample song (0:00)"
     module.set("scrolling.width", 10)
@@ -89,6 +99,7 @@ def test_slightly_changed_data(module):
     module.text = "this is a different song (0:13)"
     assert module.get(module.widget()) == module.text[0:10]
 
+
 def test_n_plus_one(module):
     module.text = "10 letters"
     module.set("scrolling.width", 9)

tests/core/test_event.py

@@ -2,9 +2,10 @@
 
 import core.event
 
+
 @pytest.fixture
 def someEvent():
-    class Event():
+    class Event:
         def __init__(self):
             core.event.clear()
             self.id = "some event"
@@ -32,6 +33,7 @@ def test_simple_callback(someEvent):
 
     assert someEvent.called == 2
 
+
 def test_args_callback(someEvent):
     core.event.register(someEvent.id, someEvent.callback, "a", "b")
     core.event.trigger(someEvent.id)
@@ -40,6 +42,7 @@ def test_args_callback(someEvent):
     assert len(someEvent.call_args) == 1
     assert someEvent.call_args[0] == ["a", "b"]
 
+
 def test_kwargs_callback(someEvent):
     core.event.register(
         someEvent.id, someEvent.callback, "a", "b", key1="test", key2="another"
@@ -50,7 +53,8 @@ def test_kwargs_callback(someEvent):
     assert len(someEvent.call_args) == 1
     assert someEvent.call_args[0] == ["a", "b"]
     assert len(someEvent.call_kwargs) == 1
-    assert someEvent.call_kwargs[0] == { "key1": "test", "key2": "another" }
+    assert someEvent.call_kwargs[0] == {"key1": "test", "key2": "another"}
+
 
 def test_arg_trigger(someEvent):
     core.event.register(someEvent.id, someEvent.callback)
@@ -60,6 +64,7 @@ def test_arg_trigger(someEvent):
     assert len(someEvent.call_args) == 1
     assert someEvent.call_args[0] == ["a", "b"]
 
+
 def test_kwargs_trigger(someEvent):
     core.event.register(someEvent.id, someEvent.callback)
     core.event.trigger(someEvent.id, "a", "c", key1="test", key2="something")
@@ -68,6 +73,7 @@ def test_kwargs_trigger(someEvent):
     assert len(someEvent.call_args) == 1
     assert someEvent.call_args[0] == ["a", "c"]
     assert len(someEvent.call_kwargs) == 1
-    assert someEvent.call_kwargs[0] == { "key1": "test", "key2": "something" }
+    assert someEvent.call_kwargs[0] == {"key1": "test", "key2": "something"}
+
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4