l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[formatting] reformat using "black -t py34"

Browse source 
getting rid of thinking about consistent formatting...
This commit is contained in:
tobi-wan-kenobi 2020-05-03 11:15:52 +02:00
parent fa98bcbdd1
commit 30c1f712a6
119 changed files with 3961 additions and 3495 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tests/util/test_algorithm.py
View file

@ -2,12 +2,13 @@ import unittest
from util.algorithm import *
class algorithm(unittest.TestCase):
def setUp(self):
self.someData = {'a': 100, 'b': 200, 'c': [1,2,3]}
self.differentData = {'x': 20, 'y': 'bla', 'z': ['a','b']}
self.moreData = {'n': 100}
self.overlapData = {'a': 200, 'c': [1,2,4]}
self.someData = {"a": 100, "b": 200, "c": [1, 2, 3]}
self.differentData = {"x": 20, "y": "bla", "z": ["a", "b"]}
self.moreData = {"n": 100}
self.overlapData = {"a": 200, "c": [1, 2, 4]}
def test_merge_with_empty(self):
self.assertEqual(self.someData, merge(self.someData, {}))
@ -37,4 +38,5 @@ class algorithm(unittest.TestCase):
for k in self.overlapData:
self.assertEqual(result[k], self.overlapData[k])
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

22
tests/util/test_cli.py
View file

@ -2,13 +2,14 @@ import unittest
import util.cli
class cli(unittest.TestCase):
def setUp(self):
self.nonExistentCommand = 'i-do-not-exist'
self.validCommand = 'echo test'
self.validCommandOutput = 'test\n'
self.utfCommand = 'echo ÖPmŧß'
self.utfCommandOutput = 'ÖPmŧß\n'
self.nonExistentCommand = "i-do-not-exist"
self.validCommand = "echo test"
self.validCommandOutput = "test\n"
self.utfCommand = "echo ÖPmŧß"
self.utfCommandOutput = "ÖPmŧß\n"
def test_valid_command(self):
rv = util.cli.execute(self.validCommand)
@ -24,16 +25,19 @@ class cli(unittest.TestCase):
def test_command_exit_code(self):
with self.assertRaises(RuntimeError):
util.cli.execute('cat {}'.format(self.nonExistentCommand))
util.cli.execute("cat {}".format(self.nonExistentCommand))
def test_command_exit_code_no_error(self):
try:
util.cli.execute('cat {}'.format(self.nonExistentCommand), ignore_errors=True)
util.cli.execute(
"cat {}".format(self.nonExistentCommand), ignore_errors=True
)
except Exception:
self.fail('exception was thrown')
self.fail("exception was thrown")
def test_async(self):
rv = util.cli.execute(self.validCommand, wait=False)
self.assertEqual('', rv)
self.assertEqual("", rv)
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

92
tests/util/test_format.py
View file

@ -2,11 +2,12 @@ import unittest
from util.format import *
class format(unittest.TestCase):
def test_int_from_string(self):
self.assertEqual(100, asint('100'))
self.assertEqual(-100, asint('-100'))
self.assertEqual(0, asint('0'))
self.assertEqual(100, asint("100"))
self.assertEqual(-100, asint("-100"))
self.assertEqual(0, asint("0"))
def test_int_from_none(self):
self.assertEqual(0, asint(None))
@ -27,73 +28,76 @@ class format(unittest.TestCase):
self.assertEqual(100, asint(200, maximum=100))
def test_true_from_str(self):
self.assertTrue(asbool('true'))
self.assertTrue(asbool("true"))
self.assertTrue(asbool(True))
self.assertTrue(asbool('t'))
self.assertTrue(asbool('1'))
self.assertTrue(asbool('yes'))
self.assertTrue(asbool('y'))
self.assertTrue(asbool('on'))
self.assertTrue(asbool("t"))
self.assertTrue(asbool("1"))
self.assertTrue(asbool("yes"))
self.assertTrue(asbool("y"))
self.assertTrue(asbool("on"))
def test_false_from_str(self):
self.assertFalse(asbool('false'))
self.assertFalse(asbool("false"))
self.assertFalse(asbool(False))
self.assertFalse(asbool('f'))
self.assertFalse(asbool('0'))
self.assertFalse(asbool('no'))
self.assertFalse(asbool('n'))
self.assertFalse(asbool('off'))
self.assertFalse(asbool("f"))
self.assertFalse(asbool("0"))
self.assertFalse(asbool("no"))
self.assertFalse(asbool("n"))
self.assertFalse(asbool("off"))
self.assertFalse(asbool(None))
def test_list_from_None(self):
self.assertEqual([], aslist(None))
def test_list_from_list(self):
self.assertEqual([1,2,3], aslist([1,2,3]))
self.assertEqual([1, 2, 3], aslist([1, 2, 3]))
def test_list_from_str(self):
self.assertEqual(['12', '13', '14'], aslist('12,13,14'))
self.assertEqual(["12", "13", "14"], aslist("12,13,14"))
def test_byteformat(self):
self.assertEqual('500.00B', byte(500))
self.assertEqual('1.00KiB', byte(1024))
self.assertEqual('1KiB', byte(1024, '{:.0f}'))
self.assertEqual('1.50KiB', byte(1024+512))
self.assertEqual('2.50MiB', byte(1024*1024*2 + 1024*512))
self.assertEqual('4.50GiB', byte(1024*1024*1024*4 + 1024*1024*512))
self.assertEqual('2048.00GiB', byte(1024*1024*1024*1024*2))
self.assertEqual("500.00B", byte(500))
self.assertEqual("1.00KiB", byte(1024))
self.assertEqual("1KiB", byte(1024, "{:.0f}"))
self.assertEqual("1.50KiB", byte(1024 + 512))
self.assertEqual("2.50MiB", byte(1024 * 1024 * 2 + 1024 * 512))
self.assertEqual("4.50GiB", byte(1024 * 1024 * 1024 * 4 + 1024 * 1024 * 512))
self.assertEqual("2048.00GiB", byte(1024 * 1024 * 1024 * 1024 * 2))
def test_duration(self):
self.assertEqual('04:20:00', duration(4*60*60+20*60))
self.assertEqual('04:20:00h', duration(4*60*60+20*60, unit=True))
self.assertEqual('04:20h', duration(4*60*60+20*60, compact=True, unit=True))
self.assertEqual("04:20:00", duration(4 * 60 * 60 + 20 * 60))
self.assertEqual("04:20:00h", duration(4 * 60 * 60 + 20 * 60, unit=True))
self.assertEqual(
"04:20h", duration(4 * 60 * 60 + 20 * 60, compact=True, unit=True)
)
self.assertEqual('20:00', duration(20*60))
self.assertEqual('20:00m', duration(20*60, unit=True))
self.assertEqual('20:00m', duration(20*60, compact=True, unit=True))
self.assertEqual("20:00", duration(20 * 60))
self.assertEqual("20:00m", duration(20 * 60, unit=True))
self.assertEqual("20:00m", duration(20 * 60, compact=True, unit=True))
self.assertEqual('00:20', duration(20))
self.assertEqual('00:20m', duration(20, unit=True))
self.assertEqual('00:20m', duration(20, compact=True, unit=True))
self.assertEqual("00:20", duration(20))
self.assertEqual("00:20m", duration(20, unit=True))
self.assertEqual("00:20m", duration(20, compact=True, unit=True))
self.assertEqual('n/a', duration(-1))
self.assertEqual("n/a", duration(-1))
def test_seconds(self):
self.assertEqual(10, seconds(10))
self.assertEqual(10, seconds('10'))
self.assertEqual(10, seconds("10"))
self.assertEqual(300, seconds('5m'))
self.assertEqual(320, seconds('5m20s'))
self.assertEqual(300, seconds("5m"))
self.assertEqual(320, seconds("5m20s"))
self.assertEqual(4*3600, seconds('4h'))
self.assertEqual(4*3600 + 5*60 + 22, seconds('4h5m22s'))
self.assertEqual(4 * 3600, seconds("4h"))
self.assertEqual(4 * 3600 + 5 * 60 + 22, seconds("4h5m22s"))
self.assertEqual(4*3600 + 5*60, seconds('4h5m'))
self.assertEqual(4 * 3600 + 5 * 60, seconds("4h5m"))
def test_temperature(self):
self.assertEqual('10°C', astemperature(10))
self.assertEqual('10°C', astemperature(10, 'metric'))
self.assertEqual('-100°F', astemperature(-100, 'imperial'))
self.assertEqual('-100°K', astemperature('-100', 'kelvin'))
self.assertEqual("10°C", astemperature(10))
self.assertEqual("10°C", astemperature(10, "metric"))
self.assertEqual("-100°F", astemperature(-100, "imperial"))
self.assertEqual("-100°K", astemperature("-100", "kelvin"))
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

40
tests/util/test_location.py
View file

@ -4,40 +4,48 @@ import urllib.request
import util.location
class location(unittest.TestCase):
def setUp(self):
patcher = unittest.mock.patch('util.location.urllib.request')
patcher = unittest.mock.patch("util.location.urllib.request")
self.addCleanup(patcher.stop)
self.request = patcher.start()
util.location.reset()
self.primary = {
'country': 'Middle Earth',
'longitude': '10.0',
'latitude': '20.5',
'ip': '127.0.0.1',
"country": "Middle Earth",
"longitude": "10.0",
"latitude": "20.5",
"ip": "127.0.0.1",
}
self.secondary = {
'country_name': 'Rivia',
'longitude': '-10.0',
'latitude': '-23',
'ip': '127.0.0.6',
"country_name": "Rivia",
"longitude": "-10.0",
"latitude": "-23",
"ip": "127.0.0.6",
}
def test_primary_provider(self):
self.request.urlopen.return_value.read.return_value = json.dumps(self.primary)
util.location.country()
self.assertEqual(self.primary['country'], util.location.country())
self.assertEqual((self.primary['latitude'], self.primary['longitude']), util.location.coordinates())
self.assertEqual(self.primary['ip'], util.location.public_ip())
self.assertEqual(self.primary["country"], util.location.country())
self.assertEqual(
(self.primary["latitude"], self.primary["longitude"]),
util.location.coordinates(),
)
self.assertEqual(self.primary["ip"], util.location.public_ip())
def test_secondary_provider(self):
urlopen = unittest.mock.MagicMock()
urlopen.read.return_value = json.dumps(self.secondary)
self.request.urlopen.side_effect = [ RuntimeError(), urlopen ]
self.request.urlopen.side_effect = [RuntimeError(), urlopen]
self.assertEqual(self.secondary["country_name"], util.location.country())
self.assertEqual(
(self.secondary["latitude"], self.secondary["longitude"]),
util.location.coordinates(),
)
self.assertEqual(self.secondary["ip"], util.location.public_ip())
self.assertEqual(self.secondary['country_name'], util.location.country())
self.assertEqual((self.secondary['latitude'], self.secondary['longitude']), util.location.coordinates())
self.assertEqual(self.secondary['ip'], util.location.public_ip())
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

28
tests/util/test_store.py
View file

@ -2,6 +2,7 @@ import unittest
import util.store
class store(unittest.TestCase):
def setUp(self):
self.store = util.store.Store()
@ -13,14 +14,24 @@ class store(unittest.TestCase):
self.someOtherValue = "anotherRandomValue"
def test_get_of_unset_key(self):
self.assertEqual(None, self.store.get(self.unusedKey), 'default value expected to be None')
self.assertEqual(self.someValue, self.store.get(self.unusedKey, self.someValue), 'wrong user-provided default value returned')
self.assertEqual(
None, self.store.get(self.unusedKey), "default value expected to be None"
)
self.assertEqual(
self.someValue,
self.store.get(self.unusedKey, self.someValue),
"wrong user-provided default value returned",
)
def test_get_of_set_key(self):
self.assertNotEqual(self.someValue, None)
self.store.set(self.someKey, self.someValue)
self.assertEqual(self.someValue, self.store.get(self.someKey), 'unexpected value for existing key')
self.assertEqual(
self.someValue,
self.store.get(self.someKey),
"unexpected value for existing key",
)
def test_overwrite_set(self):
self.assertNotEqual(self.someValue, None)
@ -28,7 +39,11 @@ class store(unittest.TestCase):
self.store.set(self.someKey, self.someValue)
self.store.set(self.someKey, self.someOtherValue)
self.assertEqual(self.someOtherValue, self.store.get(self.someKey), 'unexpected value for existing key')
self.assertEqual(
self.someOtherValue,
self.store.get(self.someKey),
"unexpected value for existing key",
)
def test_unused_keys(self):
self.assertNotEqual(self.someKey, self.someOtherKey)
@ -36,9 +51,12 @@ class store(unittest.TestCase):
self.store.set(self.someKey, self.someValue)
self.store.set(self.someOtherKey, self.someOtherValue)
self.assertEqual(sorted(self.store.unused_keys()), sorted([self.someKey, self.someOtherKey]))
self.assertEqual(
sorted(self.store.unused_keys()), sorted([self.someKey, self.someOtherKey])
)
self.store.get(self.someKey)
self.assertEqual(self.store.unused_keys(), [self.someOtherKey])
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4