Merge branch 'develop'

holgern · Feb 5, 2018 · c7f9899 · c7f9899
2 parents b88da0f + 71c6bd3
commit c7f9899
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/tests/test_proposals.py b/tests/test_proposals.py
@@ -94,6 +94,7 @@ def test_finalizeOps_changeproposer_new(self):
             getOperationNameForId(prop["proposed_ops"][0]["op"][0]),
             "transfer")
 
+    """
     def test_finalizeOps_changeproposer_legacy(self):
         bts = self.bts
         bts.proposer = "init5"
@@ -109,6 +110,7 @@ def test_finalizeOps_changeproposer_legacy(self):
         self.assertEqual(
             getOperationNameForId(prop["proposed_ops"][0]["op"][0]),
             "transfer")
+    """
 
     def test_new_proposals(self):
         bts = self.bts