Merge pull request #1985 from OpenBazaar/eth_fixes_f1720

Fix transaction ordering and enable Tor flag for the qa script

Author: placer14

Godeps/Godeps.json

@@ -204,9 +204,6 @@ def run_test(self):
         if resp["state"] != "FULFILLED":
             raise TestFailure("EthEscrowTimeoutRelease - FAIL: Alice failed to order fulfillment")
 
-        for i in range(6):
-            time.sleep(600)
-
         # Alice attempt to release funds before timeout hit
         release = {
             "OrderID": orderId,
@@ -216,11 +213,11 @@ def run_test(self):
         if r.status_code == 500:
             resp = json.loads(r.text)
             raise TestFailure("EthEscrowTimeoutRelease - FAIL: Release escrow internal server error %s", resp["reason"])
-        elif r.status_code != 400:
+        elif r.status_code != 401:
             raise TestFailure("EthEscrowTimeoutRelease - FAIL: Failed to raise error when releasing escrow before timeout")
 
         for i in range(6):
-            time.sleep(600)
+            time.sleep(900)
 
         # Alice attempt to release funds again
         release = {

qa/eth_escrow_release_after_timeout.py

@@ -112,7 +112,10 @@ def wait_for_init_success(process):
                     return
 
     def start_node(self, node):
-        args = [self.binary, "start", "-v", "-d", node["data_dir"], *self.options]
+        if self.useTor:
+            args = [self.binary, "start", "--tor", "-v", "-d", node["data_dir"], *self.options]
+        else:
+            args = [self.binary, "start", "-v", "-d", node["data_dir"], *self.options]
         process = subprocess.Popen(args, stdout=PIPE)
         peerId = self.wait_for_start_success(process, node)
         node["peerId"] = peerId
@@ -189,11 +192,13 @@ def main(self, options=["--disablewallet", "--testnet", "--disableexchangerates"
         parser.add_argument('-d', '--bitcoind', help="the bitcoind binary")
         parser.add_argument('-t', '--tempdir', action='store_true', help="temp directory to store the data folders", default="/tmp/")
         parser.add_argument('-c', '--cointype', help="cointype to test", default="BTC")
+        parser.add_argument('-T', '--tor', help="use tor in QA testing", action='store_true')
         args = parser.parse_args(sys.argv[1:])
         self.binary = args.binary
         self.temp_dir = args.tempdir
         self.bitcoind = args.bitcoind
         self.cointype = args.cointype
+        self.useTor = args.tor
         self.options = options
 
         try:

qa/test_framework/test_framework.py

@@ -156,7 +156,8 @@
 			{
 				"name": "Standard",
         		"bigPrice": "800000000",
-				"estimatedDelivery": "6-8 days"
+				"estimatedDelivery": "6-8 days",
+				"bigAdditionalItemPrice": "100000000"
 			},
 			{
 				"name": "Express",