Added Test Case To Register

StorjOld · Aug 25, 2015 · 6ce4952 · 6ce4952
1 parent 59e007e
commit 6ce4952
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/dataserv/Farmer.py b/dataserv/Farmer.py
@@ -80,7 +80,6 @@ def validate(self, registering=False):
         """Make sure this farmer fits the rules for this node."""
         # check if this is a valid BTC address or not
         if not is_btc_address(self.payout_addr):
-            print("hello")
             raise ValueError("Invalid BTC Address.")
         exists = self.exists()
         if exists and registering:

diff --git a/dataserv/app.py b/dataserv/app.py
@@ -15,6 +15,7 @@
 from dataserv.run import app, db
 from dataserv.Farmer import Farmer, AuthError
 
+
 # Helper functions
 def secs_to_mins(seconds):
     if seconds < 60:

diff --git a/tests/test_App.py b/tests/test_App.py
@@ -81,9 +81,18 @@ def test_register_w_payout(self):
         self.assertEqual(return_data, expected_data)
 
     def test_register_invalid_address(self):
+        # bad address only
         rv = self.app.get('/api/register/{0}'.format(addresses["omega"]))
+        self.assertEqual(b"Registration Failed: Invalid Bitcoin address.", rv.data)
+        self.assertEqual(rv.status_code, 400)
+
+        # good address, bad address
+        rv = self.app.get('/api/register/{0}/{1}'.format(addresses["epsilon"], addresses["omega"]))
+        self.assertEqual(b"Registration Failed: Invalid Bitcoin address.", rv.data)
+        self.assertEqual(rv.status_code, 400)
 
-        # invalid address
+        # bad address, good address
+        rv = self.app.get('/api/register/{0}/{1}'.format(addresses["omega"], addresses["zeta"]))
         self.assertEqual(b"Registration Failed: Invalid Bitcoin address.", rv.data)
         self.assertEqual(rv.status_code, 400)