diff --git a/__main__.py b/__main__.py index 3c3e15f12decde4364d2ebd67841a2e5db64065e..0206572dbfb19e9a884e1e28f67bedc2956ace40 100755 --- a/__main__.py +++ b/__main__.py @@ -21,6 +21,7 @@ import logging CONTAINER_IMAGE_ID = "kvstore-hw3-test" TEST_GROUP_ID = "hw3" + class TestRunner: def __init__(self, project_dir: str, debug_output_dir: str): self.project_dir = project_dir @@ -80,6 +81,7 @@ from .tests.basic.basic import BASIC_TESTS from .tests.asgn3.availability.availability_basic import AVAILABILITY_TESTS from .tests.asgn3.causal_consistency.causal_basic import CAUSAL_TESTS from .tests.asgn3.eventual_consistency.convergence_basic import CONVERGENCE_TESTS + # from .tests.asgn3.view_change.view_change_basic import VIEW_CHANGE_TESTS from .tests.proxy.basic_proxy import PROXY_TESTS from .tests.shuffle.basic_shuffle import SHUFFLE_TESTS @@ -87,16 +89,19 @@ from .tests.bench.benchmark import BENCHMARKS from .tests.stress.stress_tests import STRESS_TESTS TEST_SET = [] +# tests from here... TEST_SET.append(TestCase("hello_cluster", hello_cluster)) TEST_SET.extend(BASIC_TESTS) TEST_SET.extend(AVAILABILITY_TESTS) TEST_SET.extend(CAUSAL_TESTS) TEST_SET.extend(CONVERGENCE_TESTS) +# ... to here can be run in parallel. +# Below here should be run synchronously: TEST_SET.extend(PROXY_TESTS) TEST_SET.extend(SHUFFLE_TESTS) -TEST_SET.extend(BENCHMARKS) TEST_SET.extend(STRESS_TESTS) -# TEST_SET.extend(VIEW_CHANGE_TESTS) +# This one is less of a test and more a graphing program: +TEST_SET.extend(BENCHMARKS) # set to True to stop at the first failing test FAIL_FAST = True diff --git a/tests/bench/benchmark.py b/tests/bench/benchmark.py index 61b5cfa66629cdfc321f183abd5e6d1ca0a009f1..31fb4271c8b831e0eab340250f5aa6a8e44105fd 100644 --- a/tests/bench/benchmark.py +++ b/tests/bench/benchmark.py @@ -8,7 +8,7 @@ import asyncio import matplotlib.pyplot as plt NUM_SHARDS = 16 -NUM_KEYS = 20000 +NUM_KEYS = 5000 NUM_NODES = 8 def benchmark_add_shard(conductor: ClusterConductor, dir, log: Logger):