Update integration tests for Dragonchain 4.2.0 (#13)

* integration test fixes

* tune values for less failures

* tweak test timings

Author: cheeseandcereal

docs/changelog.rst

@@ -8,6 +8,7 @@ Features:
   * Add Binance interchain support
 Development:
   * Add integration tests for Binance feature
+  * Add/Update integration tests for Dragonchain 4.2.0
 
 4.0.1
 -----

tests/integration/test_blocks.py

@@ -70,7 +70,7 @@ def test_query_blocks_by_timestamp(self):
         )
 
     def test_query_blocks_by_id(self):
-        current_block = int((time.time() - 1432238220) / 5)
+        current_block = int((time.time() - 1432238220) / 5) + 1
         response1 = self.client.query_blocks("@block_id:[-inf {}]".format(current_block), sort_by="block_id", sort_ascending=True)
         response2 = self.client.query_blocks("@block_id:[-inf {}]".format(current_block), sort_by="block_id", sort_ascending=False)
         response3 = self.client.query_blocks("@block_id:[{} +inf]".format(current_block))  # Should not return any results

tests/integration/test_smart_contracts.py

@@ -205,12 +205,15 @@ def test_update_contract_execution_order(self):
     # INVOCATION #
 
     def wait_for_scheduler_invocation_1(self):
-        time.sleep(60)
+        time.sleep(55)
 
     def disable_schedule(self):
         self.assertTrue(self.client.update_smart_contract(SMART_CONTRACT_SCHEDULER_ID, disable_schedule=True).get("ok"))
         self.assertTrue(self.client.update_smart_contract(SMART_CONTRACT_CRON_ID, disable_schedule=True).get("ok"))
 
+    def wait_for_scheduler_invocation_2(self):
+        time.sleep(20)
+
     def test_successful_invocation_of_scheduler(self):
         transaction_invocation = self.client.query_transactions(SMART_CONTRACT_SCHEDULER_NAME, "*")
         global SCHEDULER_INVOCATION_COUNT
@@ -225,7 +228,7 @@ def test_successful_invocation_of_cron(self):
         self.assertGreater(CRON_INVOCATION_COUNT, 0)
         self.assertGreater(transaction_invocation["response"]["results"][0]["header"]["timestamp"], CREATION_TIMESTAMP)
 
-    def wait_for_scheduler_invocation_2(self):
+    def wait_for_scheduler_invocation_3(self):
         time.sleep(65)
 
     def test_disable_schedule_works_on_scheduler(self):
@@ -239,17 +242,24 @@ def test_disable_schedule_works_on_cron(self):
         self.assertEqual(CRON_INVOCATION_COUNT, transaction_invocation["response"]["total"])
 
     def test_successful_invocation_with_transactions(self):
-        args_transaction = self.client.create_transaction(SMART_CONTRACT_ARGS_NAME, "banana", tag="banana")
-        env_transaction = self.client.create_transaction(SMART_CONTRACT_ENV_NAME, "banana", tag="banana")
-        secrets_transaction = self.client.create_transaction(SMART_CONTRACT_SECRETS_NAME, "banana", tag="banana")
-        time.sleep(15)
-        args_query = self.client.query_transactions(SMART_CONTRACT_ARGS_NAME, "banana")
-        env_query = self.client.query_transactions(SMART_CONTRACT_ENV_NAME, "banana")
-        secrets_query = self.client.query_transactions(SMART_CONTRACT_SECRETS_NAME, "banana")
+        args_transaction = self.client.create_transaction(SMART_CONTRACT_ARGS_NAME, "banana")
+        env_transaction = self.client.create_transaction(SMART_CONTRACT_ENV_NAME, "banana")
+        secrets_transaction = self.client.create_transaction(SMART_CONTRACT_SECRETS_NAME, "banana")
+        time.sleep(30)
+        # Query for created transactions by invoker tag
+        args_query = self.client.query_transactions(
+            SMART_CONTRACT_ARGS_NAME, "@invoker:{{{}}}".format(args_transaction.get("response").get("transaction_id").replace("-", "\\-"))
+        )
+        env_query = self.client.query_transactions(
+            SMART_CONTRACT_ENV_NAME, "@invoker:{{{}}}".format(env_transaction.get("response").get("transaction_id").replace("-", "\\-"))
+        )
+        secrets_query = self.client.query_transactions(
+            SMART_CONTRACT_SECRETS_NAME, "@invoker:{{{}}}".format(secrets_transaction.get("response").get("transaction_id").replace("-", "\\-"))
+        )
+        # Check that the queries were successful and had a result with the invoker
         self.assertEqual(args_query["response"]["results"][0]["header"]["invoker"], args_transaction["response"]["transaction_id"])
         self.assertEqual(env_query["response"]["results"][0]["header"]["invoker"], env_transaction["response"]["transaction_id"])
         self.assertEqual(secrets_query["response"]["results"][0]["header"]["invoker"], secrets_transaction["response"]["transaction_id"])
-        time.sleep(10)
 
     # SMART CONTRACT LOGS #
 
@@ -381,9 +391,10 @@ def suite():
     suite.addTest(TestSmartContracts("test_update_contract_execution_order"))
     suite.addTest(TestSmartContracts("wait_for_scheduler_invocation_1"))
     suite.addTest(TestSmartContracts("disable_schedule"))
+    suite.addTest(TestSmartContracts("wait_for_scheduler_invocation_2"))
     suite.addTest(TestSmartContracts("test_successful_invocation_of_scheduler"))
     suite.addTest(TestSmartContracts("test_successful_invocation_of_cron"))
-    suite.addTest(TestSmartContracts("wait_for_scheduler_invocation_2"))
+    suite.addTest(TestSmartContracts("wait_for_scheduler_invocation_3"))
     suite.addTest(TestSmartContracts("test_disable_schedule_works_on_scheduler"))
     suite.addTest(TestSmartContracts("test_disable_schedule_works_on_cron"))
     suite.addTest(TestSmartContracts("test_successful_invocation_with_transactions"))

tests/integration/test_transactions.py

@@ -54,7 +54,7 @@ def set_up_transaction_types(self):
                     {"path": "test.num", "field_name": "query_num", "type": "number", "options": {"sortable": True}},
                 ],
             )
-            time.sleep(20)
+            time.sleep(25)
         except Exception:
             pass
 
@@ -201,7 +201,7 @@ def test_create_bulk_transactions_with_all_invalid_transactions(self):
         self.assertEqual(response["response"]["error"]["type"], "VALIDATION_ERROR", response)
 
     def wait_for_blocks(self):
-        time.sleep(8)
+        time.sleep(15)
 
     # GET #
 
@@ -288,16 +288,6 @@ def test_get_transaction_fails_with_bad_id(self):
 
     # QUERY #
 
-    def test_query_transaction_returns_stub_if_not_in_block(self):
-        txn_id = self.client.create_transaction(TEST_TXN_TYPE, "", tag="somethingUnique")["response"]["transaction_id"]
-        response = self.client.query_transactions(TEST_TXN_TYPE, "somethingUnique")
-        self.assertEqual(response.get("status"), 200)
-        self.assertTrue(response.get("ok"))
-        self.assertEqual(
-            response["response"]["results"][0],
-            {"header": {"txn_id": txn_id}, "message": "This transaction is waiting to be included in a block", "status": "pending"},
-        )
-
     def set_up_queryable_transactions(self):
         global LOW_TXN_ID
         global HIGH_TXN_ID
@@ -308,6 +298,7 @@ def set_up_queryable_transactions(self):
         HIGH_TXN_ID = self.client.create_transaction(
             QUERY_TXN_TYPE, tag="unique2 content", payload={"test": {"text": "a sortable text2 field", "tag": "someTag2", "num": 4321}}
         )["response"]["transaction_id"]
+        time.sleep(8)
 
     def test_query_transactions_generic(self):
         response = self.client.query_transactions(QUERY_TXN_TYPE, "*")
@@ -554,7 +545,6 @@ def suite():
     suite.addTest(TestTransactions("test_get_transaction_with_tag"))
     suite.addTest(TestTransactions("test_get_transaction_from_bulk_submission"))
     suite.addTest(TestTransactions("test_get_transaction_fails_with_bad_id"))
-    suite.addTest(TestTransactions("test_query_transaction_returns_stub_if_not_in_block"))
     suite.addTest(TestTransactions("test_query_transactions_generic"))
     suite.addTest(TestTransactions("test_query_transactions_by_timestamp"))
     suite.addTest(TestTransactions("test_query_transactions_by_block_id"))