From 34d7d4354ba96449542336fde630a5de472ad8be Mon Sep 17 00:00:00 2001
From: Anthony Laibe <anthony@laibe.cc>
Date: Thu, 27 Oct 2022 10:45:59 +0200
Subject: [PATCH] test: fail balance test

---
 ci/Jenkinsfile.uitests                        | 35 ++++++++++---------
 src/app_service/common/network_constants.nim  |  2 ++
 .../ui-test/src/screens/StatusWalletScreen.py |  2 +-
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/ci/Jenkinsfile.uitests b/ci/Jenkinsfile.uitests
index 0b1d321651..4ffdee48c9 100644
--- a/ci/Jenkinsfile.uitests
+++ b/ci/Jenkinsfile.uitests
@@ -57,6 +57,7 @@ pipeline {
     /* Include library in order to compile the project */
     LD_LIBRARY_PATH = "$QTDIR/lib:$WORKSPACE/vendor/status-go/build/bin:$WORKSPACE/vendor/status-keycard-go/build/libkeycard/"
     INFURA_TOKEN = "cd313fedd0dd4699b194d72b5184be06"
+    GOERLI_NETWORK_RPC_URL = "http://0.0.0.0:${855 + env.EXECUTOR_NUMBER}"
   }
 
   stages {
@@ -90,13 +91,12 @@ pipeline {
             "-p 127.0.0.1:${goerli_rpc_port}:8545 -v ${goerli_db_path}:/goerli-db",
             "-e 10 -m='${mnemonic}' --chain.chainId 5 --database.dbPath /goerli-db"
           ) { c ->
-            sh "docker logs ${c.id}"
             docker.image('statusteam/status-go:v0.84.0').withRun(
               "-p 127.0.0.1:${rpc_port}:8545 -p 127.0.0.1:${geth_port}:30303/tcp -p 127.0.0.1:${geth_port}:30303/udp -v ${env.WORKSPACE}/ci/mailserver/config.json:/config.json",
               "-log=INFO -log-without-color -c=/config.json -dir=/tmp"
             ) { c2 ->
               env.PEER_ENR = sh(script:"RPC_PORT=${rpc_port} MAILSERVER_PORT=${geth_port} ${env.WORKSPACE}/ci/mailserver/get_enode.sh", returnStdout:true).trim()
-              withEnv(["TEST_PEER_ENR=${env.PEER_ENR}", "GOERLI_NETWORK_RPC_URL=http://0.0.0.0:${goerli_rpc_port}"]){
+              withEnv(["TEST_PEER_ENR=${env.PEER_ENR}"]){
                 wrap([
                   $class: 'Xvfb',
                   autoDisplayName: true,
@@ -109,22 +109,22 @@ pipeline {
                         --retry
                         2
 
-                      --tags
-                      ~mayfail
-                      
-                      --tags
-                      ~merge
+                        --tags
+                        ~mayfail
+                        
+                        --tags
+                        ~merge
 
-                      --tags
-                      ~relyon-mailserver
-                      
-                      --config
-                      addAUT
-                      nim_status_client
-                      ${WORKSPACE}/bin
-                    ''',
-                    squishPackageName: 'squish-6.7.2-qt514x-linux64',
-                    testSuite: '${WORKSPACE}/test/ui-test/testSuites/*',
+                        --tags
+                        ~relyon-mailserver
+                        
+                        --config
+                        addAUT
+                        nim_status_client
+                        ${WORKSPACE}/bin
+                      ''',
+                      squishPackageName: 'squish-6.7.2-qt514x-linux64',
+                      testSuite: '${WORKSPACE}/test/ui-test/testSuites/*',
                     ])
                     echo res
                     if ( res == "SUCCESS" || res == "UNSTABLE" ) {
@@ -135,6 +135,7 @@ pipeline {
                 }
               }
             }
+            sh "docker logs ${c.id}"
           }
         }
       }
diff --git a/src/app_service/common/network_constants.nim b/src/app_service/common/network_constants.nim
index e222546161..46f0b9008a 100644
--- a/src/app_service/common/network_constants.nim
+++ b/src/app_service/common/network_constants.nim
@@ -12,6 +12,7 @@ let INFURA_TOKEN_RESOLVED =
   else:
     INFURA_TOKEN
 
+
 const GOERLI_NETWORK_RPC_URL = $getEnv("GOERLI_NETWORK_RPC_URL")
 let GOERLI_RPC_URL_RESOLVED =
   if GOERLI_NETWORK_RPC_URL != "":
@@ -19,6 +20,7 @@ let GOERLI_RPC_URL_RESOLVED =
   else:
     "https://goerli.infura.io/v3/" & INFURA_TOKEN_RESOLVED
 
+
 let GOERLI_CONFIG = 
   if GOERLI_NETWORK_RPC_URL != "":
     %* {
diff --git a/test/ui-test/src/screens/StatusWalletScreen.py b/test/ui-test/src/screens/StatusWalletScreen.py
index 157d251bda..400d850e3b 100644
--- a/test/ui-test/src/screens/StatusWalletScreen.py
+++ b/test/ui-test/src/screens/StatusWalletScreen.py
@@ -299,7 +299,7 @@ class StatusWalletScreen:
                     found = True
                     if (tokenListItem.balance == "0" and reset < 3):
                         break
-                    
+
                     return
                 
             if not found: