diff --git a/benchmarks/basic_commands.py b/benchmarks/basic_commands.py index abada82ff5f986f19887941918b744e947566c75_YmVuY2htYXJrcy9iYXNpY19jb21tYW5kcy5weQ==..0a0aa685addf8a962e825d0694dca2af2e379fa6_YmVuY2htYXJrcy9iYXNpY19jb21tYW5kcy5weQ== 100644 --- a/benchmarks/basic_commands.py +++ b/benchmarks/basic_commands.py @@ -20,7 +20,8 @@ BaseTestSuite, params_as_kwargs, median, - REPOS_DIR + REPOS_DIR, + STRIP_VARIANTS, ) if sys.version_info[0] == 2: @@ -28,14 +29,13 @@ else: import queue -# TODO: don't hardcode -STRIP_REVSETS = { - 'same': "tip", - 'last-ten': "last(all(), 10)", - 'last-hundred': "last(all(), 100)", - 'last-thousand': "last(all(), 1000)", -} - +STRIP_REVSETS = {} +for key, value in STRIP_VARIANTS.items(): + if value is None: + # not sure why tip is the expected value here + STRIP_REVSETS[key] = 'tip' + else: + STRIP_REVSETS[key] = value['remove'] def get_strip_variants(): return ["same", "last-ten", "last-hundred", "last-thousand"] diff --git a/benchmarks/utils.py b/benchmarks/utils.py index abada82ff5f986f19887941918b744e947566c75_YmVuY2htYXJrcy91dGlscy5weQ==..0a0aa685addf8a962e825d0694dca2af2e379fa6_YmVuY2htYXJrcy91dGlscy5weQ== 100644 --- a/benchmarks/utils.py +++ b/benchmarks/utils.py @@ -10,6 +10,7 @@ import subprocess import sys import timeit +import yaml from functools import wraps REPO_SUFFIX='.benchrepo' @@ -20,10 +21,8 @@ REPOS_DATA = sorted(d for d in os.listdir(REPOS_DIR) if d.endswith(REPO_SUFFIX)) REPOS = [r[:-len(REPO_SUFFIX)] for r in REPOS_DATA] -# TODO fix -# with open(STRIP_VARIANTS_PATH) as f: -# STRIP_VARIANTS = yaml.load(f.read())["partial-sets"] - +with open(STRIP_VARIANTS_PATH) as f: + STRIP_VARIANTS = yaml.load(f.read())["partial-sets"] class SkipResult(Exception): pass