Skip to content

Commit 235b4d3

Browse files
Greg Dubickisebastianrakel
Greg Dubicki
authored andcommitted
This should fix all tests
1 parent d2c9e53 commit 235b4d3

File tree

3 files changed

+31
-15
lines changed

3 files changed

+31
-15
lines changed

puppetboard/static/css/puppetboard.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ h1.ui.header.no-margin-bottom {
5757
background-color: #4572A7;
5858
}
5959

60+
.ui.header.population {
61+
background-color: #2C3E50;
62+
}
63+
6064
.ui.header.unreported {
6165
color: #3D96AE;
6266
}

puppetboard/templates/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ <h1 class="ui header unreported no-margin-bottom">
5151
<span>unreported in the last {{ config.UNRESPONSIVE_HOURS }} hours</span>
5252
</div>
5353
<div class="column">
54-
<h1 class="ui header darkblue no-margin-bottom">
54+
<h1 class="ui header population no-margin-bottom">
5555
{{ metrics['num_nodes'] }}
5656
<small>{% if metrics['num_nodes'] == 1 %} node {% else %} nodes {% endif %}</small>
5757
</h1>

test/test_app.py

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,14 @@ def test_index_all(client, mocker,
169169
vals = soup.find_all('h1',
170170
{"class": "ui header darkblue no-margin-bottom"})
171171

172-
assert len(vals) == 3
173-
assert vals[0].string == '10'
174-
assert vals[1].string == '63'
175-
assert vals[2].string == ' 6'
172+
assert len(vals) == 2
173+
assert vals[0].string == '63'
174+
assert vals[1].string == ' 6'
175+
176+
vals2 = soup.find_all('h1',
177+
{"class": "ui header population no-margin-bottom"})
178+
assert len(vals2) == 1
179+
assert '10' in vals2[0].string
176180

177181
assert rv.status_code == 200
178182

@@ -219,10 +223,14 @@ def test_index_all_puppetdb_v4(client, mocker,
219223
vals = soup.find_all('h1',
220224
{"class": "ui header darkblue no-margin-bottom"})
221225

222-
assert len(vals) == 3
223-
assert vals[0].string == '10'
224-
assert vals[1].string == '63'
225-
assert vals[2].string == ' 6'
226+
assert len(vals) == 2
227+
assert vals[0].string == '63'
228+
assert vals[1].string == ' 6'
229+
230+
vals2 = soup.find_all('h1',
231+
{"class": "ui header population no-margin-bottom"})
232+
assert len(vals2) == 1
233+
assert '10' in vals2[0].string
226234

227235
assert rv.status_code == 200
228236

@@ -269,10 +277,14 @@ def test_index_all_puppetdb_v3(client, mocker,
269277
vals = soup.find_all('h1',
270278
{"class": "ui header darkblue no-margin-bottom"})
271279

272-
assert len(vals) == 3
273-
assert vals[0].string == '10'
274-
assert vals[1].string == '60'
275-
assert vals[2].string == ' 6'
280+
assert len(vals) == 2
281+
assert vals[0].string == '60'
282+
assert vals[1].string == ' 6'
283+
284+
vals2 = soup.find_all('h1',
285+
{"class": "ui header population no-margin-bottom"})
286+
assert len(vals2) == 1
287+
assert '10' in vals2[0].string
276288

277289
assert rv.status_code == 200
278290

@@ -298,8 +310,8 @@ def test_index_division_by_zero(client, mocker,
298310

299311
vals = soup.find_all('h1',
300312
{"class": "ui header darkblue no-margin-bottom"})
301-
assert len(vals) == 3
302-
assert vals[2].string == '0'
313+
assert len(vals) == 2
314+
assert vals[1].string == '0'
303315

304316

305317
def test_offline_mode(client, mocker,

0 commit comments

Comments
 (0)