anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Code Releases Activity

fix merged code

Browse source
This commit is contained in:
Shlomi Fish 2020-05-06 15:09:23 +03:00
parent c7a3907d25
commit 52d37cfeae
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/lib/pysol_tests/game_drag.py
View file

@ -2,11 +2,7 @@
import unittest import unittest
<<<<<<< HEAD
from pysollib.game import GameDrag, GameStacks from pysollib.game import GameDrag, GameStacks
=======
from pysollib.game import GameDrag
>>>>>>> f3d3517... add missing attribute.
class MyTests(unittest.TestCase): class MyTests(unittest.TestCase):
@ -14,12 +10,9 @@ class MyTests(unittest.TestCase):
d = GameDrag() d = GameDrag()
d.shadows.append("test") d.shadows.append("test")
self.assertTrue(len(d.shadows)) self.assertTrue(len(d.shadows))
<<<<<<< HEAD
def test_addattr(self): def test_addattr(self):
s = GameStacks() s = GameStacks()
s.addattr(tableaux=[]) s.addattr(tableaux=[])
s.tableaux.append("myval") s.tableaux.append("myval")
self.assertEqual(s.tableaux, ["myval"]) self.assertEqual(s.tableaux, ["myval"])
=======
>>>>>>> f3d3517... add missing attribute.