Skip to content

Commit

Permalink
PEP8 Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
super3 committed May 30, 2015
1 parent fa236c9 commit f8df149
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion dataserv/Farmer.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ def register(self):

def exists(self):
"""Check to see if this address is already listed."""
return db.session.query(Farmer.btc_addr).filter(Farmer.btc_addr==self.btc_addr).count() > 0
return db.session.query(Farmer.btc_addr).filter(Farmer.btc_addr == self.btc_addr).count() > 0
17 changes: 9 additions & 8 deletions tests/test_Farmer.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,17 @@

class FarmerTest(unittest.TestCase):

# not working properly
SQLALCHEMY_DATABASE_URI = "sqlite://dataserv_test.db"
TESTING = True

def setUp(self):
db.create_all()

def tearDown(self):
db.session.remove()
db.drop_all()

def test_valid_address(self):
addr1 = '191GVvAaTRxLmz3rW3nU5jAV1rF186VxQc'
addr2 = '191GVvAaTRxLmz3rW3nU5jAV1rF186VxQc9999ghjfghj99'
Expand Down Expand Up @@ -37,13 +45,6 @@ def test_repr(self):
ans = "<Farmer BTC Address: '191GVvAaTRxLmz3rW3nU5jAV1rF186VxQc'>"
self.assertEqual(repr(farmer), ans)

def setUp(self):
db.create_all()

def tearDown(self):
db.session.remove()
db.drop_all()

def test_register(self):
addr1 = '191GVvAaTRxLmz3rW3nU5jAV1rF186VxQc'
addr2 = '191GVvAaTRxLmz3rW3nU5jAV1rF186VxQc9999ghjfghj99'
Expand All @@ -66,4 +67,4 @@ def test_register(self):

# double check they are not in the db
self.assertFalse(farmer2.exists())
self.assertFalse(farmer3.exists())
self.assertFalse(farmer3.exists())

0 comments on commit f8df149

Please sign in to comment.