Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve tests code even more #432

Merged
merged 9 commits into from
Apr 1, 2024
Merged

Improve tests code even more #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7b62e63
tests: use subprocess.run to run child process
perillo Mar 30, 2024
142810e
tests: make shutil.rmtree more robust
perillo Mar 30, 2024
904697e
tests: improve custom messages in a test case
perillo Mar 31, 2024
c62f6f0
tests: rename the parse_cobertura module to cobertura
perillo Mar 31, 2024
ad6df5b
tests: remove unnecessary creation of outdir
perillo Mar 31, 2024
d2403a7
tests: use consistent naming convention in test cases
perillo Apr 1, 2024
ac9bc0c
tests: make configuration values KcovTestCase members
perillo Apr 1, 2024
8462925
tests: add testbase.KcovTestCase.doCmd method
perillo Apr 1, 2024
9794dd0
tests: make calls to KcovTestCase.do more strict
perillo Apr 1, 2024
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
169 changes: 66 additions & 103 deletions tests/tools/accumulate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,199 +1,162 @@
import parse_cobertura
import cobertura
import testbase


class accumulate_data(testbase.KcovTestCase):
def runTest(self):
rv, o = self.do(
testbase.kcov
+ " "
+ testbase.outbase
+ "/kcov "
+ testbase.sources
+ "/tests/python/main"
self.kcov + " " + self.outbase + "/kcov " + self.sources + "/tests/python/main"
)

dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
assert parse_cobertura.hitsPerLine(dom, "main", 16) == 1
assert parse_cobertura.hitsPerLine(dom, "main", 19) == 0
assert parse_cobertura.hitsPerLine(dom, "main", 14) == 1
dom = cobertura.parseFile(self.outbase + "/kcov/main/cobertura.xml")
assert cobertura.hitsPerLine(dom, "main", 16) == 1
assert cobertura.hitsPerLine(dom, "main", 19) == 0
assert cobertura.hitsPerLine(dom, "main", 14) == 1

rv, o = self.do(
testbase.kcov
+ " "
+ testbase.outbase
+ "/kcov "
+ testbase.sources
+ "/tests/python/main 5"
self.kcov + " " + self.outbase + "/kcov " + self.sources + "/tests/python/main 5"
)
dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
assert parse_cobertura.hitsPerLine(dom, "main", 16) == 1
assert parse_cobertura.hitsPerLine(dom, "main", 19) == 1
assert parse_cobertura.hitsPerLine(dom, "main", 14) == 2
dom = cobertura.parseFile(self.outbase + "/kcov/main/cobertura.xml")
assert cobertura.hitsPerLine(dom, "main", 16) == 1
assert cobertura.hitsPerLine(dom, "main", 19) == 1
assert cobertura.hitsPerLine(dom, "main", 14) == 2


class dont_accumulate_data_with_clean(testbase.KcovTestCase):
def runTest(self):
rv, o = self.do(
testbase.kcov
+ " "
+ testbase.outbase
+ "/kcov "
+ testbase.sources
+ "/tests/python/main"
self.kcov + " " + self.outbase + "/kcov " + self.sources + "/tests/python/main"
)

dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
assert parse_cobertura.hitsPerLine(dom, "main", 16) == 1
assert parse_cobertura.hitsPerLine(dom, "main", 19) == 0
assert parse_cobertura.hitsPerLine(dom, "main", 14) == 1
dom = cobertura.parseFile(self.outbase + "/kcov/main/cobertura.xml")
assert cobertura.hitsPerLine(dom, "main", 16) == 1
assert cobertura.hitsPerLine(dom, "main", 19) == 0
assert cobertura.hitsPerLine(dom, "main", 14) == 1

rv, o = self.do(
testbase.kcov
self.kcov
+ " --clean "
+ testbase.outbase
+ self.outbase
+ "/kcov "
+ testbase.sources
+ self.sources
+ "/tests/python/main 5"
)
dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/main/cobertura.xml")
assert parse_cobertura.hitsPerLine(dom, "main", 16) == 0
assert parse_cobertura.hitsPerLine(dom, "main", 19) == 1
assert parse_cobertura.hitsPerLine(dom, "main", 14) == 1
dom = cobertura.parseFile(self.outbase + "/kcov/main/cobertura.xml")
assert cobertura.hitsPerLine(dom, "main", 16) == 0
assert cobertura.hitsPerLine(dom, "main", 19) == 1
assert cobertura.hitsPerLine(dom, "main", 14) == 1


class merge_basic(testbase.KcovTestCase):
def runTest(self):
rv, o = self.do(
testbase.kcov
+ " "
+ testbase.outbase
+ "/kcov "
+ testbase.sources
+ "/tests/python/main 5"
self.kcov + " " + self.outbase + "/kcov " + self.sources + "/tests/python/main 5"
)
rv, o = self.do(
testbase.kcov
+ " "
+ testbase.outbase
+ "/kcov "
+ testbase.sources
+ "/tests/bash/shell-main"
self.kcov + " " + self.outbase + "/kcov " + self.sources + "/tests/bash/shell-main"
)

dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/kcov-merged/cobertura.xml")
assert parse_cobertura.hitsPerLine(dom, "main", 10) == 1
assert parse_cobertura.hitsPerLine(dom, "shell-main", 4) == 1
dom = cobertura.parseFile(self.outbase + "/kcov/kcov-merged/cobertura.xml")
assert cobertura.hitsPerLine(dom, "main", 10) == 1
assert cobertura.hitsPerLine(dom, "shell-main", 4) == 1


class merge_multiple_output_directories(testbase.KcovTestCase):
def runTest(self):
rv, o = self.do(
testbase.kcov
+ " "
+ testbase.outbase
+ "/kcov/first "
+ testbase.sources
+ "/tests/python/main 5"
self.kcov + " " + self.outbase + "/kcov/first " + self.sources + "/tests/python/main 5"
)
rv, o = self.do(
testbase.kcov
self.kcov
+ " "
+ testbase.outbase
+ self.outbase
+ "/kcov/second "
+ testbase.sources
+ self.sources
+ "/tests/bash/shell-main"
)
rv, o = self.do(
testbase.kcov
self.kcov
+ " --merge "
+ testbase.outbase
+ self.outbase
+ "/kcov/merged "
+ testbase.outbase
+ self.outbase
+ "/kcov/first "
+ testbase.outbase
+ self.outbase
+ "/kcov/second"
)
dom = parse_cobertura.parseFile(testbase.outbase + "/kcov/merged/kcov-merged/cobertura.xml")
assert parse_cobertura.hitsPerLine(dom, "main", 10) == 1
assert parse_cobertura.hitsPerLine(dom, "shell-main", 4) == 1
dom = cobertura.parseFile(self.outbase + "/kcov/merged/kcov-merged/cobertura.xml")
assert cobertura.hitsPerLine(dom, "main", 10) == 1
assert cobertura.hitsPerLine(dom, "shell-main", 4) == 1


class merge_merged_output(testbase.KcovTestCase):
def runTest(self):
rv, o = self.do(
testbase.kcov
+ " "
+ testbase.outbase
+ "/kcov/first "
+ testbase.sources
+ "/tests/python/main 5"
self.kcov + " " + self.outbase + "/kcov/first " + self.sources + "/tests/python/main 5"
)
rv, o = self.do(
testbase.kcov
self.kcov
+ " "
+ testbase.outbase
+ self.outbase
+ "/kcov/second "
+ testbase.sources
+ self.sources
+ "/tests/bash/shell-main"
)
rv, o = self.do(
testbase.kcov
self.kcov
+ " "
+ testbase.outbase
+ self.outbase
+ "/kcov/third "
+ testbase.sources
+ self.sources
+ "/tests/bash/dollar-var-replacements.sh"
)

rv, o = self.do(
testbase.kcov
self.kcov
+ " --merge "
+ testbase.outbase
+ self.outbase
+ "/kcov/merged "
+ testbase.outbase
+ self.outbase
+ "/kcov/first "
+ testbase.outbase
+ self.outbase
+ "/kcov/second"
)
rv, o = self.do(
testbase.kcov
self.kcov
+ " --merge "
+ testbase.outbase
+ self.outbase
+ "/kcov/merged2 "
+ testbase.outbase
+ self.outbase
+ "/kcov/merged "
+ testbase.outbase
+ self.outbase
+ "/kcov/third"
)
dom = parse_cobertura.parseFile(
testbase.outbase + "/kcov/merged2/kcov-merged/cobertura.xml"
)
assert parse_cobertura.hitsPerLine(dom, "main", 10) == 1
assert parse_cobertura.hitsPerLine(dom, "shell-main", 4) == 1
assert parse_cobertura.hitsPerLine(dom, "dollar-var-replacements.sh", 2) == 1
dom = cobertura.parseFile(self.outbase + "/kcov/merged2/kcov-merged/cobertura.xml")
assert cobertura.hitsPerLine(dom, "main", 10) == 1
assert cobertura.hitsPerLine(dom, "shell-main", 4) == 1
assert cobertura.hitsPerLine(dom, "dollar-var-replacements.sh", 2) == 1


class merge_coveralls(testbase.KcovTestCase):
def runTest(self):
rv, o = self.do(
testbase.kcov
self.kcov
+ " --coveralls-id=dry-run "
+ testbase.outbase
+ self.outbase
+ "/kcov/ "
+ testbase.sources
+ self.sources
+ "/tests/python/main 5"
)
rv, o = self.do(
testbase.kcov
self.kcov
+ " --coveralls-id=dry-run "
+ testbase.outbase
+ self.outbase
+ "/kcov/ "
+ testbase.sources
+ self.sources
+ "/tests/bash/shell-main"
)

rv, o = self.doShell(f"grep second.py {(testbase.outbase)}/kcov/main/coveralls.out")
rv, o = self.doShell(f"grep second.py {(self.outbase)}/kcov/main/coveralls.out")
assert rv == 0
rv, o = self.doShell(f"grep shell-main {(testbase.outbase)}/kcov/shell-main/coveralls.out")
rv, o = self.doShell(f"grep shell-main {(self.outbase)}/kcov/shell-main/coveralls.out")
assert rv == 0
Loading
Loading