hotfix for CLI testing script (#66)

Co-authored-by: Michael Flaxman <[email protected]>

Author: mflaxman

test_multiwallet.py

@@ -34,11 +34,9 @@ def test_seedpicker_basic(self):
             self.child.sendline("generate_seed")
             self.child.expect("Enter the first 23 words of your BIP39 seed phrase")
             self.child.sendline("bacon " * 23)
-            # HACK
-            # self.child.expect() doesn't work as expected because the prompts take place in the middle of a line
             self.child.readline()
-            res = str(self.child.read(42))
-            self.assertIn("Use Mainnet? [y/N]", res)
+            res = str(self.child.read(20))
+            self.assertIn("Use Mainnet?", res)
             self.child.sendline(is_mainnet)
             self.child.expect("Last word: bacon")
             for _ in range(5):
@@ -53,18 +51,16 @@ def test_receive_addr(self):
         self.child.sendline("receive")
         for _ in range(6):
             self.child.readline()
-        res = str(self.child.read(70))
+        res = str(self.child.read(50))
         self.assertIn("Paste in your account map (AKA output record)", res)
         self.child.sendline(account_map)
         self.child.readline()
-        res = str(self.child.read(60))
+        res = str(self.child.read(40))
         self.assertIn("Limit of addresses to display", res)
         self.child.sendline("1")
-        res = str(self.child.read(60))
+        self.child.readline()
+        res = str(self.child.read(40))
         self.assertIn("Offset of addresses to display", res)
-        if False:
-            # FIXME: verify this
-            self.child.sendline("N")
         self.child.sendline("0")
         self.child.expect("1-of-2 Multisig Receive Addresses")
         self.child.expect(receive_addr)
@@ -76,17 +72,22 @@ def test_change_addr(self):
         self.child.sendline("advanced_mode")
         self.child.expect("ADVANCED mode set")
         self.child.sendline("receive")
-        res = str(self.child.read(115))
+        self.child.readline()
+        self.child.readline()
+        res = str(self.child.read(50))
         self.assertIn("Paste in your account map (AKA output record)", res)
         self.child.sendline(account_map)
         self.child.readline()
-        res = str(self.child.read(60))
+        res = str(self.child.read(40))
         self.assertIn("Limit of addresses to display", res)
         self.child.sendline("1")
-        res = str(self.child.read(60))
+        self.child.readline()
+        res = str(self.child.read(40))
         self.assertIn("Offset of addresses to display", res)
         self.child.sendline("0")
-        # FIXME: verify this
+        self.child.readline()
+        res = str(self.child.read(80))
+        self.assertIn("Display receive addresses?", res)
         self.child.sendline("N")
         self.child.expect("1-of-2 Multisig Change Addresses")
         self.child.expect(change_addr)
@@ -98,17 +99,19 @@ def test_sign_tx(self):
         signed_psbt_b64 = "cHNidP8BAFICAAAAASqJ31Trzpdt/MCBc1rpqmJyTcrhHNgqYqmsoDzHoklrAQAAAAD+////AYcmAAAAAAAAFgAUVH5mMP/WhqzXEzUORHbh1WJ7TS4AAAAAAAEBKxAnAAAAAAAAIgAgW8ODIeZA3ep/uESxtEZmQlxl4Q0QWWbe4I7x3aHuEvAiAgI0eOoa6SLJeaxzFWRXvzgWElJmJgyZMSfbSZ7plUxF9kgwRQIhAKTtWurRx19SWBS0G50IkvEDqbdZG2Q0KuTPB3BRWUCoAiBBWAtAQdmL+uV7aMwcJIacsFtYzrGagkhf6ZfEySXPXgEBBYtRIQI0eOoa6SLJeaxzFWRXvzgWElJmJgyZMSfbSZ7plUxF9iECYYmlbj1NXorYlB1Ed7jOwa4nt+xwhePNaxnQW53o6lQhApaCK4Vcv04C6td57v3zGuHGrrVjXQEMKwKbbS8GHrkKIQLEV1INwWxsAYHEj/ElyUDHWQOxdbsfQzP2LT4IRZmWY1SuIgYCNHjqGukiyXmscxVkV784FhJSZiYMmTEn20me6ZVMRfYc99BAkDAAAIABAACAAAAAgAIAAIAAAAAABgAAACIGAmGJpW49TV6K2JQdRHe4zsGuJ7fscIXjzWsZ0Fud6OpUHDpStc0wAACAAQAAgAAAAIACAACAAAAAAAYAAAAiBgKWgiuFXL9OAurXee798xrhxq61Y10BDCsCm20vBh65ChwSmA7tMAAAgAEAAIAAAACAAgAAgAAAAAAGAAAAIgYCxFdSDcFsbAGBxI/xJclAx1kDsXW7H0Mz9i0+CEWZlmMcx9BkijAAAIABAACAAAAAgAIAAIAAAAAABgAAAAAA"
 
         self.child.sendline("send")
-        res = str(self.child.read(220))
+        for _ in range(6):
+            self.child.readline()
+        res = str(self.child.read(50))
         self.assertIn("Paste in your account map (AKA output record)", res)
         self.child.sendline(account_map)
         self.child.readline()
-        res = str(self.child.read(90))
+        res = str(self.child.read(70))
         self.assertIn(
             "Paste partially signed bitcoin transaction (PSBT) in base64 form", res
         )
         self.child.sendline(unsigned_psbt_b64)
         self.child.readline()
-        res = str(self.child.read(100))
+        res = str(self.child.read(75))
         self.assertIn(
             "Transaction appears to be a testnet transaction. Display as testnet?", res
         )
@@ -128,18 +131,21 @@ def test_sign_tx(self):
         )
         for _ in range(19):
             self.child.readline()
-        res = str(self.child.read(45))
-        self.assertIn("Sign this transaction? [Y/n]", res)
+        res = str(self.child.read(30))
+        self.assertIn("Sign this transaction?", res)
         self.child.sendline("Y")
-        res = str(self.child.read(62))
+        self.child.readline()
+        res = str(self.child.read(40))
         self.assertIn("Enter your full BIP39 seed phrase", res)
         self.child.sendline(seed_phrase)
         self.child.readline()
-        res = str(self.child.read(70))
-        self.assertIn("Use a passphrase (advanced users only)? [y/N]", res)
+        res = str(self.child.read(50))
+        self.assertIn("Use a passphrase (advanced users only)?", res)
         self.child.sendline("N")
         self.child.expect("Signed PSBT to broadcast")
-        res = str(self.child.read(890))
+        self.child.readline()
+        self.child.readline()
+        res = str(self.child.readline())
         self.assertIn(signed_psbt_b64, res)
 
     def test_fail(self):

test_singlesweep.py

@@ -36,31 +36,31 @@ def test_send_compressed(self):
         self.child.sendline("sweep")
         for _ in range(5):
             self.child.readline()
-        res = str(self.child.read(90))
+        res = str(self.child.read(70))
         self.assertIn("Enter WIF (Wallet Import Format) to use for signing:", res)
         self.child.sendline("cMahea7zqjxrtgAbB7LSGbcQUr1uX1ojuh9HqjiLNWDVQudB7k4E")
         self.child.expect(
             "Will attempt to spend from TESTNET mxgA6BsDLcv4vooLx4j6MfHQRihbrdwV5P"
         )
-        res = str(self.child.read(85))
+        self.child.readline()
+        res = str(self.child.read(70))
         self.assertIn(
             "Paste partially signed bitcoin transaction (PSBT) in base64 form", res
         )
         psbt_to_sign = "cHNidP8BAFUCAAAAAVRZh97dheVJzHkcaznyZCtSunoNJgnNGBRKGYw5nBSQAQAAAAD9////ASCFAQAAAAAAGXapFJ+aer1gDAyqA5g6d8jD344GLLL6iKxZiR4AAAEA4gIAAAAAAQEy/IizvbchxG0F6yLb/g0qEa9HidaAzlDzGCUMNgwZTQAAAAAA/v///wKEOaMAAAAAABepFOpylCCZWu7JekQ9p98RPeFn3kRoh6CGAQAAAAAAGXapFLw3unG6dBaKPCHEL+A8dYsff8aRiKwCRzBEAiBanqsb6aKeGstvedoheUCnr7buvdOHz58/J803NfsOkAIgOIpcQ+OGZEzFo7E3FBvUHagLZJLik8vf9KqnfVwfn9MBIQO3M5Kw2cHk3i3s1FpZK69B/oUOubZhv6e/GU7n6RVAeViJHgAAAA=="
         self.child.sendline(psbt_to_sign)
-        res = str(self.child.read(580))
-        self.assertIn(
-            "PSBT sends 99,616 sats to mv4rnyY3Su5gjcDNzbMLKBQkBicCtHUtFB with an UNVERIFIED fee of 384 sats (0.38% of spend)",
-            res,
-        )
+        self.child.readline()
+        res = str(self.child.readline())
+        want = "PSBT sends 99,616 sats to mv4rnyY3Su5gjcDNzbMLKBQkBicCtHUtFB with an UNVERIFIED fee of 384 sats (0.38% of spend)"
+        self.assertIn(want, res)
         res = str(self.child.read(40))
         self.assertIn("In Depth Transaction View? [Y/n]", res)
         self.child.sendline("Y")
         self.child.expect("DETAILED VIEW")
         for _ in range(21):
             self.child.readline()
-        res = str(self.child.read(45))
-        self.assertIn("Sign this transaction? [Y/n]: ", res)
+        res = str(self.child.read(35))
+        self.assertIn("Sign this transaction?", res)
         self.child.sendline("Y")
         self.child.expect(
             "SIGNED TX 0dfc0c3b8e0e87b6321a75fca542c22f792b2d6f519720e0a974976c646b7d5e"
@@ -86,31 +86,31 @@ def test_send_uncompressed(self):
         self.child.sendline("sweep")
         for _ in range(5):
             self.child.readline()
-        res = str(self.child.read(90))
+        res = str(self.child.read(70))
         self.assertIn("Enter WIF (Wallet Import Format) to use for signing:", res)
         self.child.sendline("91avARGdfge8E4tZfYLoxeJ5sGBdNJQH4nM1C3RmiaMW6WFGmDS")
         self.child.expect(
             "Will attempt to spend from TESTNET mzJtwV9LL6B3Nvm1uc1Z5NK3mqqaZyn9w1"
         )
-        res = str(self.child.read(85))
+        self.child.readline()
+        res = str(self.child.read(70))
         self.assertIn(
             "Paste partially signed bitcoin transaction (PSBT) in base64 form", res
         )
         psbt_to_sign = "cHNidP8BAFUCAAAAAaASEHE91UJrrmU5FMjXIVUV5HF91EGzcaktfooEUPBFAAAAAAD9////AWPhFwAAAAAAGXapFJ+aer1gDAyqA5g6d8jD344GLLL6iKxniR4AAAEA4gIAAAAAAQH96ccGxhmgYfsrP9xnIUl2WJxnE+Jz2iAH08QAkPiSiQAAAAAA/v///wLj4hcAAAAAABl2qRTOIpkaGEnqK3MB5zwY6WWk/ZKiRoisAWO7XQAAAAAXqRT2kti1/KAVtU90LS4zl1LNGa3NtocCRzBEAiAnsPi908ar1ROFyTWV4TlqlKHijNRbOuolJILCG2G6ywIgCPZLYkWebvcTOztJj3I+D6CX/y9DCZRRhrD9QJtdR80BIQPLHa2FJlrG7KzxKA6ZVJfJ2P3xGp/88a65XIkCNK6Xk1iJHgAAAA=="
         self.child.sendline(psbt_to_sign)
-        res = str(self.child.read(580))
-        self.assertIn(
-            "PSBT sends 1,565,027 sats to mv4rnyY3Su5gjcDNzbMLKBQkBicCtHUtFB with an UNVERIFIED fee of 384 sats (0.02% of spend)",
-            res,
-        )
-        res = str(self.child.read(45))
-        self.assertIn("In Depth Transaction View? [Y/n]", res)
+        self.child.readline()
+        res = str(self.child.readline())
+        want = "PSBT sends 1,565,027 sats to mv4rnyY3Su5gjcDNzbMLKBQkBicCtHUtFB with an UNVERIFIED fee of 384 sats (0.02% of spend)"
+        self.assertIn(want, res)
+        res = str(self.child.read(40))
+        self.assertIn("In Depth Transaction View?", res)
         self.child.sendline("Y")
         self.child.expect("DETAILED VIEW")
         for _ in range(21):
             self.child.readline()
-        res = str(self.child.read(45))
-        self.assertIn("Sign this transaction? [Y/n]: ", res)
+        res = str(self.child.read(35))
+        self.assertIn("Sign this transaction?", res)
         self.child.sendline("Y")
         self.child.expect(
             "SIGNED TX f3271bbac2b66d83379de855a79cead9d0e5210b857bee5c22462635033861c4"

update_pypi.sh

@@ -17,9 +17,11 @@ rm -rf buidl.egg-info/
 find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf
 
 # Tests
+if [ -f requirements-test.txt ]; then python3 -m pip install -r requirements-test.txt; fi
 black --check .
 flake8 .
-pytest -v
+pytest -v buidl/test/
+pytest -v test_*.py
 
 # Safety
 git push