Skip to content

Commit e6c5d88

Browse files
committed
fix flake8 findings
Signed-off-by: hwassman <[email protected]>
1 parent 1025641 commit e6c5d88

File tree

1 file changed

+18
-19
lines changed

1 file changed

+18
-19
lines changed

tests/test_collector.py

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ def my_setup():
1717
topo = Topo(topoStr)
1818
logger = configureLogging(path, None)
1919
prometheus_attrs = {'sensor': 'GPFSFilesystem', 'period': 300,
20-
'nsamples': 300, 'rawData': True}
21-
pfilters = {'node':'scale-16', 'gpfs_filesystem_name' : 'afmCacheFS'}
22-
pquery_filters = [ f"{k}={v}" for k, v in pfilters.items()]
20+
'nsamples': 300, 'rawData': True}
21+
pfilters = {'node': 'scale-16', 'gpfs_filesystem_name': 'afmCacheFS'}
22+
pquery_filters = [f"{k}={v}" for k, v in pfilters.items()]
2323

2424

2525
@with_setup(my_setup)
@@ -32,9 +32,9 @@ def test_case01():
3232
query = request.get_zimon_query()
3333
query.includeDiskData = md_instance.includeDiskData.return_value
3434
queryString = 'get -j {0} {1} group {2} bucket_size {3} {4}'.format(
35-
'', '-z', prometheus_attrs.get('sensor'),
36-
prometheus_attrs.get('period'),
37-
f"last {prometheus_attrs.get('period')}")
35+
'', '-z', prometheus_attrs.get('sensor'),
36+
prometheus_attrs.get('period'),
37+
f"last {prometheus_attrs.get('period')}")
3838
queryString += '\n'
3939
assert "group" in query.__str__()
4040
assert "last" in query.__str__()
@@ -53,9 +53,9 @@ def test_case02():
5353
query = request.get_zimon_query()
5454
query.includeDiskData = md_instance.includeDiskData.return_value
5555
queryString = 'get -j {0} {1} group {2} bucket_size {3} {4}'.format(
56-
'', '', prometheus_attrs.get('sensor'),
57-
prometheus_attrs.get('period'),
58-
f"last {prometheus_attrs.get('nsamples')}")
56+
'', '', prometheus_attrs.get('sensor'),
57+
prometheus_attrs.get('period'),
58+
f"last {prometheus_attrs.get('nsamples')}")
5959
queryString += '\n'
6060
assert "group" in query.__str__()
6161
assert "last" in query.__str__()
@@ -64,7 +64,7 @@ def test_case02():
6464

6565
@with_setup(my_setup)
6666
def test_case03():
67-
prometheus_attrs.update({'filters' : pfilters})
67+
prometheus_attrs.update({'filters': pfilters})
6868
with mock.patch('source.collector.QueryPolicy.md') as md:
6969
md_instance = md.return_value
7070
md_instance.includeDiskData.return_value = False
@@ -73,9 +73,9 @@ def test_case03():
7373
query = request.get_zimon_query()
7474
query.includeDiskData = md_instance.includeDiskData.return_value
7575
queryString = 'get -j {0} {1} group {2} bucket_size {3} {4}'.format(
76-
'', '-z', prometheus_attrs.get('sensor'),
77-
prometheus_attrs.get('period'),
78-
f"last {prometheus_attrs.get('period')}")
76+
'', '-z', prometheus_attrs.get('sensor'),
77+
prometheus_attrs.get('period'),
78+
f"last {prometheus_attrs.get('period')}")
7979
queryString += ' from ' + ",".join(pquery_filters)
8080
queryString += '\n'
8181
assert "group" in query.__str__()
@@ -86,7 +86,7 @@ def test_case03():
8686

8787
@with_setup(my_setup)
8888
def test_case04():
89-
prometheus_attrs.update({'filters' : pfilters})
89+
prometheus_attrs.update({'filters': pfilters})
9090
prometheus_attrs.update({'nsamples': 1, 'rawData': False})
9191
with mock.patch('source.collector.QueryPolicy.md') as md:
9292
md_instance = md.return_value
@@ -96,9 +96,9 @@ def test_case04():
9696
query = request.get_zimon_query()
9797
query.includeDiskData = md_instance.includeDiskData.return_value
9898
queryString = 'get -j {0} {1} group {2} bucket_size {3} {4}'.format(
99-
'', '', prometheus_attrs.get('sensor'),
100-
prometheus_attrs.get('period'),
101-
f"last {prometheus_attrs.get('nsamples')}")
99+
'', '', prometheus_attrs.get('sensor'),
100+
prometheus_attrs.get('period'),
101+
f"last {prometheus_attrs.get('nsamples')}")
102102
queryString += ' from ' + ",".join(pquery_filters)
103103
queryString += '\n'
104104
assert "group" in query.__str__()
@@ -115,7 +115,7 @@ def test_case05(col_md, sts_md, md):
115115
sensor = prometheus_attrs.get('sensor')
116116
period = prometheus_attrs.get('period')
117117
logger = logging.getLogger(__name__)
118-
prometheus_attrs.update({'filters' : pfilters})
118+
prometheus_attrs.update({'filters': pfilters})
119119
prometheus_attrs.update({'nsamples': 1, 'rawData': False})
120120

121121
md_instance = md.return_value
@@ -139,4 +139,3 @@ def test_case05(col_md, sts_md, md):
139139
assert collector.period == period
140140
assert collector.request == request
141141
assert collector.labels == topo.getSensorLabels(sensor)
142-

0 commit comments

Comments
 (0)