Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion cmd/package
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
# Creates a package for Testrun

MAKE_SRC_DIR=make
TESTRUN_VER="1-2-1-alpha"

# Delete existing make files
rm -rf $MAKE_SRC_DIR/usr
Expand Down Expand Up @@ -56,4 +57,7 @@ cp -r {framework,modules} $MAKE_SRC_DIR/usr/local/testrun
dpkg-deb --build --root-owner-group make

# Rename the .deb file
mv make.deb testrun_1-2_amd64.deb
mv make.deb testrun_${TESTRUN_VER}_amd64.deb

# Echo package version
echo Created installation package at testrun_${TESTRUN_VER}_amd64.deb
14 changes: 11 additions & 3 deletions framework/python/src/common/testreport.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def __init__(self,
self._report_url = ''
self._cur_page = 0
# Placeholder until available in json report
self._version = 'v1.2'
self._version = 'v1.2.1-alpha'

def add_module_reports(self, module_reports):
self._module_reports = module_reports
Expand Down Expand Up @@ -356,6 +356,8 @@ def generate_result(self, result):
result_class = 'result-test-result-non-compliant'
elif result['result'] == 'Compliant':
result_class = 'result-test-result-compliant'
elif result['result'] == 'Error':
result_class = 'result-test-result-error'
else:
result_class = 'result-test-result-skipped'

Expand Down Expand Up @@ -857,10 +859,16 @@ def generate_css(self):
max-width: 380px;
}

.result-test-result-error {
background-color: #FCE8E6;
color: #C5221F;
left: 7.3in;
}

.result-test-result-non-compliant {
background-color: #FCE8E6;
color: #C5221F;
left: 7.02in;
left: 7.04in;
}

.result-test-result {
Expand All @@ -882,7 +890,7 @@ def generate_css(self):
.result-test-result-skipped {
background-color: #e3e3e3;
color: #393939;
left: 7.2in;
left: 7.22in;
}

/* CSS for the footer */
Expand Down
2 changes: 1 addition & 1 deletion make/DEBIAN/control
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: Testrun
Version: 1.2
Version: 1.2.1-alpha
Architecture: amd64
Maintainer: Google <boddey@google.com>
Homepage: https://github.com/google/testrun
Expand Down