[Issue 21] Migrate to pytest

.circleci/config.yml

@@ -0,0 +1,27 @@
+version: 1
+jobs:
+  build:
+    working_directory: ~/cbc-casper
+    docker:
+     # NOTE: to be updated in issue #18
+     - image: circleci/python:2.7
+    steps:
+      - checkout
+      - restore_cache:
+          key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
+      - run:
+          command: |
+            virtualenv venv
+            . venv/bin/activate
+            pip install -r requirements.txt
+      - save_cache:
+          key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
+          paths:
+            - "venv"
+      - run:
+          command: |
+            . venv/bin/activate
+            pytest
+      - store_artifacts:
+          path: test-reports/
+          destination: tr1

.gitignore

@@ -5,3 +5,5 @@ venv*
 *.prof
 *.orig
 results.txt
+
+.cache/

README.md

@@ -19,11 +19,11 @@ kernprof -l casper.py (rand | rrob | full | nofinal)
 ```
 
 ## Run Tests
-To run all unit tests:
+To run all tests:
 ```
-python -m unittest discover
+pytest
 ```
 To run a specific test, use (or the equivalent for whatever test you wish to run)
 ```
-python -m unittest test.test_safety_oracle
+pytest tests/test_safety_oracle.py
 ```

casper.py

@@ -10,16 +10,16 @@
 import sys
 
 import random as r  # to ensure the tie-breaking property
-import settings as s
+import casper.settings as s
 
-from justification import Justification
-from view import View
-from network import Network
-from validator import Validator
-from safety_oracles.clique_oracle import CliqueOracle
-import utils
-import plot_tool
-import presets
+from casper.justification import Justification
+from casper.view import View
+from casper.network import Network
+from casper.validator import Validator
+from casper.safety_oracles.clique_oracle import CliqueOracle
+import casper.utils as utils
+import casper.plot_tool as plot_tool
+import casper.presets as presets
 
 
 def main():
@@ -130,4 +130,6 @@ def main():
             #for i in xrange(s.NUM_VALIDATORS):
             #    plot_tool.plot_view(network.validators[i].view)
 
-main()
+
+if __name__ == "__main__":
+    main()

block.py → casper/block.py

@@ -1,7 +1,5 @@
-import copy
-import settings as s
-
-from justification import Justification
+import casper.settings as s
+from casper.justification import Justification
 
 
 class Block:

forkchoice.py → casper/forkchoice.py

@@ -1,7 +1,4 @@
-import settings as s
-import random as r
-import copy
-import utils
+import casper.settings as s
 
 
 def get_max_weight_indexes(scores):
@@ -34,7 +31,8 @@ def get_fork_choice(last_finalized_block, children, latest_messages):
             curr_scores[child] = scores.get(child, 0)
             max_score = max(curr_scores[child], max_score)
 
-        # we don't choose weight 0 children. Also possible to make non-deterministic decision here.
+        # we don't choose weight 0 children.
+        # Also possible to make non-deterministic decision here.
         if max_score == 0:
             break
 

justification.py → casper/justification.py

@@ -1,7 +1,3 @@
-import random as r
-import forkchoice
-
-
 class Justification:
     def __init__(self, last_finalized_block=None, latest_messages=dict()):
         self.last_finalized_block = last_finalized_block

network.py → casper/network.py

@@ -1,10 +1,8 @@
-import random as r  # to ensure the tie-breaking property
-import settings as s
+import casper.settings as s
 
-from view import View
-from validator import Validator
-from block import Block
-import plot_tool
+from casper.validator import Validator
+from casper.view import View
+import casper.plot_tool as plot_tool
 
 
 class Network:

plot_tool.py → casper/plot_tool.py

@@ -1,6 +1,4 @@
 import networkx as nx
-from block import Block
-import settings as s
 from math import pi
 
 import matplotlib as mpl
@@ -14,6 +12,10 @@
 from PIL import Image
 import os
 
+from casper.block import Block
+import casper.settings as s
+
+
 base = 10000000
 IMAGE_LIMIT = 75
 FRAMES = "graphs/"

presets.py → casper/presets.py

@@ -1,7 +1,8 @@
-import settings as s
 import random as r
 import itertools
 
+import casper.settings as s
+
 
 def message_maker(mode):
 

safety_oracles/adversary_models/adversary.py → casper/safety_oracles/adversary_models/adversary.py

@@ -1,5 +1,8 @@
-import settings as s
-from model_validator import ModelValidator
+import casper.settings as s
+from casper.safety_oracles.adversary_models.model_validator import (
+    ModelValidator
+)
+
 
 class Adversary:
 

safety_oracles/adversary_models/model_bet.py → casper/safety_oracles/adversary_models/model_bet.py

@@ -1,4 +1,5 @@
-import settings as s
+import casper.settings as s
+
 
 class ModelBet:
 

safety_oracles/adversary_models/model_utils.py → casper/safety_oracles/adversary_models/model_utils.py

@@ -1,4 +1,5 @@
-import settings as s
+import casper.settings as s
+
 
 def get_estimate_from_latest_messages(latest_bets, default=None):
 

safety_oracles/adversary_models/model_validator.py → casper/safety_oracles/adversary_models/model_validator.py

@@ -1,7 +1,8 @@
-import settings as s
-import model_utils
-from model_bet import ModelBet
-from model_view import Model_View
+import casper.settings as s
+import casper.safety_oracles.adversary_models.model_utils as model_utils
+from casper.safety_oracles.adversary_models.model_bet import (
+    ModelBet
+)
 
 
 class ModelValidator:

safety_oracles/adversary_oracle.py → casper/safety_oracles/adversary_oracle.py

@@ -1,7 +1,7 @@
-import settings as s
-from adversary_models.model_bet import ModelBet
-from adversary_models.adversary import Adversary
-import utils
+import casper.settings as s
+from casper.adversary_models.model_bet import ModelBet
+from casper.adversary_models.adversary import Adversary
+import capser.utils as utils
 
 
 class AdversaryOracle:

safety_oracles/clique_oracle.py → casper/safety_oracles/clique_oracle.py

@@ -1,8 +1,6 @@
-import settings as s
-from block import Block
-import utils
+import casper.settings as s
+import casper.utils as utils
 
-import copy
 import itertools
 import networkx as nx
 

test/testing_language.py → casper/testing_language.py

@@ -1,13 +1,16 @@
 import re
 import random as r
 
-import settings as s
-from network import Network
-from safety_oracles.clique_oracle import CliqueOracle
-import utils
+import casper.settings as s
+from casper.network import Network
+from casper.safety_oracles.clique_oracle import CliqueOracle
+import casper.utils as utils
 
 
 class TestLangCBC:
+    # signal to py.test that TestLangCBC should not be discovered
+    __test__ = False
+
     TOKEN_PATTERN = '([A-Za-z]*)([0-9]*)([-]*)([A-Za-z0-9]*)'
 
     def __init__(self, test_string, val_weights, display=False):

utils.py → casper/utils.py

@@ -1,4 +1,4 @@
-import settings as s
+import casper.settings as s
 
 def are_conflicting_estimates(estimate, possibly_conflicting_estimate):
     return not estimate.is_in_blockchain(possibly_conflicting_estimate)

validator.py → casper/validator.py

@@ -1,4 +1,3 @@
-import settings as s
 from block import Block
 from view import View
 from justification import Justification
@@ -16,7 +15,6 @@ class Validator:
     # The validator's state is a function of its view and name alone (along with global variables)
     # However, for performance's sake the validator also stores
     def __init__(self, name):
-        assert name in s.VALIDATOR_NAMES, "expected a validator name"
         self.name = name
         self.view = View(set())
 

view.py → casper/view.py

@@ -1,7 +1,5 @@
-from block import Block
-from justification import Justification
-import forkchoice
-import copy
+from casper.justification import Justification
+import casper.forkchoice as forkchoice
 
 
 class View:

conftest.py

@@ -0,0 +1,29 @@
+import pytest
+
+from casper.testing_language import TestLangCBC
+
+
+def pytest_addoption(parser):
+    parser.addoption("--report", action="store_true", default=False,
+                     help="plot TestLangCBC tests")
+
+
+def run_test_lang_with_reports(test_string, weights):
+    TestLangCBC(test_string, weights, True).parse()
+
+
+def run_test_lang_without_reports(test_string, weights):
+    TestLangCBC(test_string, weights, False).parse()
+
+
+@pytest.fixture
+def report(request):
+    return request.config.getoption("--report")
+
+
+@pytest.fixture
+def test_lang_runner(report):
+    if report:
+        return run_test_lang_with_reports
+    else:
+        return run_test_lang_without_reports

requirements.txt

@@ -18,8 +18,10 @@ pickleshare==0.7.4
 Pillow==4.3.0
 prompt-toolkit==1.0.15
 ptyprocess==0.5.2
+py==1.4.34
 Pygments==2.2.0
 pyparsing==2.2.0
+pytest==3.2.3
 python-dateutil==2.6.1
 pytz==2017.2
 scandir==1.6