Skip to content

Add runtests option to gitdiff on the common ancestor #6913

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

Merged
sklam merged 3 commits into from
Apr 13, 2021
Merged

Add runtests option to gitdiff on the common ancestor #6913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb17633
Add option for runtests --gitdiff to compare against common ancestor.
sklam Apr 9, 2021
e695a2f
Add test for gitdiff
sklam Apr 9, 2021
7718ec2
Denoise test output by sinking stderr to devnull
sklam Apr 12, 2021
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
29 changes: 22 additions & 7 deletions numba/testing/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,18 @@ def _getParentArgParser(self):
parser.add_argument('-j', '--slice', dest='useslice', nargs='?',
type=str, const="None",
help='Slice the test sequence')
parser.add_argument('-g', '--gitdiff', dest='gitdiff',
action='store_true',

def git_diff_str(x):
if x != 'ancestor':
raise ValueError("invalid option for --gitdiff")
return x

parser.add_argument('-g', '--gitdiff', dest='gitdiff', type=git_diff_str,
default=False, nargs='?',
help=('Run tests from changes made against '
'origin/master as identified by `git diff`'))
'origin/master as identified by `git diff`. '
'If set to "ancestor", the diff compares '
'against the common ancestor.'))
return parser

def _handle_tags(self, argv, tagstr):
Expand Down Expand Up @@ -266,8 +274,11 @@ def parseArgs(self, argv):
self.test = _choose_random_tests(self.test, self.random_select,
self.random_seed)

if self.gitdiff:
self.test = _choose_gitdiff_tests(self.test)
if self.gitdiff is not False:
self.test = _choose_gitdiff_tests(
self.test,
use_common_ancestor=(self.gitdiff == 'ancestor'),
)

if self.verbosity <= 0:
# We aren't interested in informational messages / warnings when
Expand Down Expand Up @@ -379,14 +390,18 @@ def key(x):
return tests


def _choose_gitdiff_tests(tests):
def _choose_gitdiff_tests(tests, *, use_common_ancestor=False):
try:
from git import Repo
except ImportError:
raise ValueError("gitpython needed for git functionality")
repo = Repo('.')
path = os.path.join('numba', 'tests')
>
if use_common_ancestor:
print(f"Git diff by common ancestor")
>
else:
>
gdiff_paths = repo.git.diff(target, path, name_only=True).split()
# normalise the paths as they are unix style from repo.git.diff
gdiff_paths = [os.path.normpath(x) for x in gdiff_paths]
Expand Down
29 changes: 27 additions & 2 deletions numba/tests/test_runtests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,14 @@ class TestCase(unittest.TestCase):
Therefore, the logic used here shouldn't use numba.testing, but only the
upstream unittest, and run the numba test suite only in a subprocess."""

def get_testsuite_listing(self, args):
def get_testsuite_listing(self, args, *, subp_kwargs=None):
"""
Use `subp_kwargs` to pass extra argument to `subprocess.check_output`.
"""
subp_kwargs = subp_kwargs or {}
cmd = [sys.executable, '-m', 'numba.runtests', '-l'] + list(args)
lines = subprocess.check_output(cmd).decode('UTF-8').splitlines()
out_bytes = subprocess.check_output(cmd, **subp_kwargs)
lines = out_bytes.decode('UTF-8').splitlines()
lines = [line for line in lines if line.strip()]
return lines

Expand Down Expand Up @@ -116,6 +121,26 @@ def filter_test(xs):
# The tests must be equivalent
self.assertEqual(sorted(full), sorted(sliced))

def test_gitdiff(self):
# Check for git
try:
subprocess.call("git",
stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL)
except FileNotFoundError as e:
self.skipTest("no git available")

# default
outs = self.get_testsuite_listing(['-g'])
self.assertNotIn("Git diff by common ancestor", outs)
# using ancestor
outs = self.get_testsuite_listing(['-g=ancestor'])
self.assertIn("Git diff by common ancestor", outs)
# misspelled ancestor
subp_kwargs = dict(stderr=subprocess.DEVNULL)
with self.assertRaises(subprocess.CalledProcessError):
self.get_testsuite_listing(['-g=ancest'], subp_kwargs=subp_kwargs)


if __name__ == '__main__':
unittest.main()