Skip to content

Commit

Permalink
Merge pull request #78 from littleskunk/patch-3
Browse files Browse the repository at this point in the history 
pep8
  • Loading branch information
@F483
F483 committed Sep 24, 2015
2 parents 1ace296 + f370c1d commit e09e691
Showing 1 changed file with 28 additions and 14 deletions.
42 changes: 28 additions & 14 deletions tests/test_Farmer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ def test_sha256(self):

def test_register(self):
# test success
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(self.btctxstore.create_wallet()))
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(
self.btctxstore.create_wallet()))
farmer1 = Farmer(btc_addr)
self.assertFalse(farmer1.exists())
farmer1.register()
Expand All @@ -53,7 +54,8 @@ def callback_a():
self.assertRaises(ValueError, callback_a)

def test_ping(self):
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(self.btctxstore.create_wallet()))
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(
self.btctxstore.create_wallet()))
farmer = Farmer(btc_addr)

# test ping before registration
Expand All @@ -71,7 +73,8 @@ def test_ping(self):
self.assertTrue(register_time < ping_time)

def test_ping_time_limit(self):
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(self.btctxstore.create_wallet()))
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(
self.btctxstore.create_wallet()))
farmer = Farmer(btc_addr)
farmer.register()

Expand All @@ -84,7 +87,8 @@ def test_ping_time_limit(self):
self.assertEqual(delta_seconds, 0)

def test_height(self):
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(self.btctxstore.create_wallet()))
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(
self.btctxstore.create_wallet()))
farmer = Farmer(btc_addr)
farmer.register()

Expand All @@ -98,7 +102,8 @@ def test_height(self):
self.assertEqual(farmer2.height, 5)

def test_audit(self):
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(self.btctxstore.create_wallet()))
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(
self.btctxstore.create_wallet()))
farmer = Farmer(btc_addr)

# test audit before registration
Expand All @@ -116,7 +121,8 @@ def test_audit(self):
self.assertTrue(register_time < ping_time)

def test_to_json(self):
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(self.btctxstore.create_wallet()))
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(
self.btctxstore.create_wallet()))
farmer = Farmer(btc_addr)
farmer.register()

Expand Down Expand Up @@ -272,7 +278,8 @@ def tearDown(self):
db.drop_all()

def test_register(self):
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(self.btctxstore.create_wallet()))
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(
self.btctxstore.create_wallet()))
farmer = Farmer(btc_addr)
farmer.register()

Expand Down Expand Up @@ -321,7 +328,8 @@ def test_register(self):
self.assertEqual(test_json, call_payload)

def test_ping_100(self):
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(self.btctxstore.create_wallet()))
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(
self.btctxstore.create_wallet()))
farmer = Farmer(btc_addr)
farmer.register()

Expand All @@ -343,7 +351,8 @@ def test_ping_100(self):
self.assertEqual(test_json, call_payload)

def test_ping_50(self):
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(self.btctxstore.create_wallet()))
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(
self.btctxstore.create_wallet()))
farmer = Farmer(btc_addr)
farmer.register()

Expand All @@ -365,7 +374,8 @@ def test_ping_50(self):
self.assertEqual(test_json, call_payload)

def test_ping_25(self):
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(self.btctxstore.create_wallet()))
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(
self.btctxstore.create_wallet()))
farmer = Farmer(btc_addr)
farmer.register()

Expand All @@ -387,7 +397,8 @@ def test_ping_25(self):
self.assertEqual(test_json, call_payload)

def test_ping_days(self):
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(self.btctxstore.create_wallet()))
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(
self.btctxstore.create_wallet()))
farmer = Farmer(btc_addr)
farmer.register()

Expand All @@ -410,7 +421,8 @@ def test_ping_days(self):
self.assertEqual(test_json, call_payload)

def test_height_100(self):
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(self.btctxstore.create_wallet()))
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(
self.btctxstore.create_wallet()))
farmer = Farmer(btc_addr)
farmer.register()

Expand All @@ -432,7 +444,8 @@ def test_height_100(self):
self.assertEqual(test_json, call_payload)

def test_height_50(self):
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(self.btctxstore.create_wallet()))
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(
self.btctxstore.create_wallet()))
farmer = Farmer(btc_addr)
farmer.register()

Expand All @@ -454,7 +467,8 @@ def test_height_50(self):
self.assertEqual(test_json, call_payload)

def test_height_25(self):
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(self.btctxstore.create_wallet()))
btc_addr = self.btctxstore.get_address(self.btctxstore.get_key(
self.btctxstore.create_wallet()))
farmer = Farmer(btc_addr)
farmer.register()

Expand Down

0 comments on commit e09e691

Please sign in to comment.