From fbedea4c81a866106ba14235c28b05fa1eaed581 Mon Sep 17 00:00:00 2001 From: Paul-Louis NECH Date: Sun, 5 Apr 2020 14:10:37 +0200 Subject: [PATCH] fix(test): turn_defeats --- server/model/data.py | 9 +++------ server/test/test_game.py | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/server/model/data.py b/server/model/data.py index d767413..b19e9c3 100644 --- a/server/model/data.py +++ b/server/model/data.py @@ -49,12 +49,9 @@ class Game: self.deck.reset() for current_player in self.players: current_player.clear() - draw = [] for i in range(self.defeats[current_player] + 1): - draw.append(self.deck.random_card()) - print(f"Drew {draw} for {current_player}.") - for d in draw: - current_player.give(d) + current_player.give(self.deck.random_card()) + print(f"Drew {current_player.hand} for {current_player}.") # Tour self.current_bet = None @@ -91,6 +88,7 @@ class Game: def count_defeat(self, loser): self.defeats[loser] += 1 + print(f"Total defeats for {loser}: {self.defeats[loser]}") def add_player(self, player: Player): """ @@ -133,7 +131,6 @@ class Game: print(f" {current_player} bets {self.current_bet}.") else: # Menteur! Who lost the round? - print(f" {current_player} says Menteur!") menteur = self.is_menteur(self.current_bet) loser = last_player if menteur else current_player self.count_defeat(loser) diff --git a/server/test/test_game.py b/server/test/test_game.py index 4896e37..235249e 100644 --- a/server/test/test_game.py +++ b/server/test/test_game.py @@ -36,7 +36,7 @@ class TestGame(TestCase): self.game = Game([menteur, naive]) self.game.new_turn() - self.assertEqual(1, len(self.game.defeats.values()), "There should have been one defeat.") + self.assertEqual(1, len([v for v in self.game.defeats.values() if v > 0]), "There should have been one defeat.") self.assertTrue(1 in self.game.defeats.values(), "A player should have one defeat.") loser = [p for p in self.game.players if self.game.defeats[p]][0] -- libgit2 0.27.0