diff --git a/tests/asgn3/causal_consistency/causal_basic.py b/tests/asgn3/causal_consistency/causal_basic.py index 4dadaf187904a473a80a22b9a4698994dc09869c..dccba37946b73235651fd2a610b0c588ea9487ca 100644 --- a/tests/asgn3/causal_consistency/causal_basic.py +++ b/tests/asgn3/causal_consistency/causal_basic.py @@ -451,7 +451,7 @@ def causal_basic_tiebreak(conductor, dir, log): b = david.get(1, "x") assert b.ok, f"expected ok for get, got {b.status_code}" - assert a.json()["value"] == b.json()["value"], f"expected {a} == {b}" + assert a.json()["value"] == b.json()["value"], f"expected {a.json()['value']} == {b.json()['value']}" if a.json()["value"] == "1": assert alice_hang, f"expected alice to hang" diff --git a/tests/shuffle/basic_shuffle.py b/tests/shuffle/basic_shuffle.py index de404cc917eebd94002971e80e9e3df5cb160cb0..16f7acc0b696f4bf7e894ed77d8ea6752f1e3d54 100644 --- a/tests/shuffle/basic_shuffle.py +++ b/tests/shuffle/basic_shuffle.py @@ -100,7 +100,7 @@ def basic_shuffle_add_remove(conductor: ClusterConductor, dir, log: Logger): return True, "ok" -def basic_shuffle(conductor: ClusterConductor, dir, log: Logger): +def basic_shuffle_1(conductor: ClusterConductor, dir, log: Logger): with KVSTestFixture(conductor, dir, log, node_count=3) as fx: c = KVSMultiClient(fx.clients, "client", log) conductor.add_shard("shard1", conductor.get_nodes([0])) @@ -347,4 +347,4 @@ def basic_shuffle_3(conductor: ClusterConductor, dir, log: Logger): return True, "ok" -SHUFFLE_TESTS = [TestCase("basic_shuffle_add_remove", basic_shuffle_add_remove), TestCase("basic_shuffle", basic_shuffle), TestCase("basic_shuffle_2", basic_shuffle_2), TestCase("basic_shuffle_3", basic_shuffle_3)] +SHUFFLE_TESTS = [TestCase("basic_shuffle_add_remove", basic_shuffle_add_remove), TestCase("basic_shuffle_1", basic_shuffle_1), TestCase("basic_shuffle_2", basic_shuffle_2), TestCase("basic_shuffle_3", basic_shuffle_3)] diff --git a/utils/containers.py b/utils/containers.py index cf78e6ae9b0a693b7856233448edf26b47b56383..df7126b5753bc5f73fb11d8d2e63f8d7f576c6bf 100644 --- a/utils/containers.py +++ b/utils/containers.py @@ -257,20 +257,22 @@ class ClusterConductor: self.log(f" starting container {node_name} (ext_port={external_port})") # start container detached from networks + run_cmd = [ + CONTAINER_ENGINE, + "run", + "-d", + "--name", + node_name, + "--env", + f"NODE_IDENTIFIER={i}", + "-p", + f"{external_port}:{port}", + self.base_image, + ] + if CONTAINER_ENGINE == "podman": + run_cmd.append("--log-driver=k8s-file") run_cmd_bg( - [ - CONTAINER_ENGINE, - "run", - "-d", - "--log-driver=k8s-file", - "--name", - node_name, - "--env", - f"NODE_IDENTIFIER={i}", - "-p", - f"{external_port}:{port}", - self.base_image, - ], + run_cmd, verbose=True, error_prefix=f"failed to start container {node_name}", log=self.log, @@ -502,8 +504,8 @@ class ClusterConductor: node.index ].base_url = self.node_external_endpoint(node.index) view_changed = True - #if view_changed and hasattr(self, "_parent"): - # self._parent.rebroadcast_view(self.get_shard_view()) + if view_changed and hasattr(self, "_parent"): + self._parent.rebroadcast_view(self.get_shard_view()) DeprecationWarning("View is in updated format")