From 64a199c5c4a7de21c37074489b3ef2d32a3d2c9e Mon Sep 17 00:00:00 2001
From: Michael Shaw <michael@abastionofsanity.com>
Date: Mon, 6 Mar 2023 11:42:59 -0500
Subject: [PATCH 1/5] run race tests in CICD

---
 .github/workflows/old_tests.yml | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/old_tests.yml b/.github/workflows/old_tests.yml
index 2b7cfdfd7..a7e4a8063 100644
--- a/.github/workflows/old_tests.yml
+++ b/.github/workflows/old_tests.yml
@@ -37,6 +37,28 @@ jobs:
       - name: Run unit tests
         run: |
           make test
+          
+
+  geth-unit-race-test:
+    name: Run geth unit test with race flag
+    runs-on: ubuntu-latest
+    env:
+      GO111MODULE: on
+    steps:
+      - name: Create GOPATH
+        run: mkdir -p /tmp/go
+
+      - uses: actions/setup-go@v3
+        with:
+          go-version: "1.18"
+          check-latest: true
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Run unit tests
+        run: |      
+          go run build/ci.go test -race
 
   statediff-unit-test:
     name: Run state diff unit test
@@ -121,7 +143,6 @@ jobs:
         run: |
           COUNT=0
           ATTEMPTS=15
-          sleep 30;
           docker logs local_go-ethereum_1
           docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-sharding.yml" -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec go-ethereum ps aux 
           until $(docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-sharding.yml" -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" cp go-ethereum:/root/transaction_info/STATEFUL_TEST_DEPLOYED_ADDRESS ./STATEFUL_TEST_DEPLOYED_ADDRESS) || [[ $COUNT -eq $ATTEMPTS ]]; do echo -e "$(( COUNT++ ))... \c"; sleep 10; done
-- 
2.45.2


From 55c16d934bc261ecbd30102e5674e20b1e8ec66f Mon Sep 17 00:00:00 2001
From: Michael Shaw <michael@abastionofsanity.com>
Date: Tue, 7 Mar 2023 10:24:48 -0500
Subject: [PATCH 2/5] set HOME env for .ethereum mkdir permission denied

---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 98b02490a..7ca6588e6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,6 +33,7 @@ pipeline {
                 GOMODCACHE = "/tmp/go/pkg/mod"
                 GOWORK=""
                 //GOFLAGS=""
+                HOME="${WORKSPACE}"
 
             }
             steps {
-- 
2.45.2


From 6bc24d67133cfb3ef25dcca96e7a4b5258845004 Mon Sep 17 00:00:00 2001
From: Michael Shaw <michael@abastionofsanity.com>
Date: Tue, 7 Mar 2023 11:02:10 -0500
Subject: [PATCH 3/5] use same homeDir method as other places in code

---
 internal/flags/flags_test.go | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/internal/flags/flags_test.go b/internal/flags/flags_test.go
index 681586b46..abfab04b0 100644
--- a/internal/flags/flags_test.go
+++ b/internal/flags/flags_test.go
@@ -23,6 +23,16 @@ import (
 	"testing"
 )
 
+func homeDir() string {
+	if home := os.Getenv("HOME"); home != "" {
+		return home
+	}
+	if usr, err := user.Current(); err == nil {
+		return usr.HomeDir
+	}
+	return ""
+}
+
 func TestPathExpansion(t *testing.T) {
 	user, _ := user.Current()
 	var tests map[string]string
@@ -30,7 +40,7 @@ func TestPathExpansion(t *testing.T) {
 	if runtime.GOOS == "windows" {
 		tests = map[string]string{
 			`/home/someuser/tmp`:        `\home\someuser\tmp`,
-			`~/tmp`:                     user.HomeDir + `\tmp`,
+			`~/tmp`:                     homeDir() + `\tmp`,
 			`~thisOtherUser/b/`:         `~thisOtherUser\b`,
 			`$DDDXXX/a/b`:               `\tmp\a\b`,
 			`/a/b/`:                     `\a\b`,
@@ -41,7 +51,7 @@ func TestPathExpansion(t *testing.T) {
 	} else {
 		tests = map[string]string{
 			`/home/someuser/tmp`:        `/home/someuser/tmp`,
-			`~/tmp`:                     user.HomeDir + `/tmp`,
+			`~/tmp`:                     homeDir() + `/tmp`,
 			`~thisOtherUser/b/`:         `~thisOtherUser/b`,
 			`$DDDXXX/a/b`:               `/tmp/a/b`,
 			`/a/b/`:                     `/a/b`,
-- 
2.45.2


From a37cddbb6afacf931fa9c617c0856e58dc9e7f78 Mon Sep 17 00:00:00 2001
From: Michael Shaw <michael@abastionofsanity.com>
Date: Tue, 7 Mar 2023 12:30:10 -0500
Subject: [PATCH 4/5] unused variable in test removed

---
 internal/flags/flags_test.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/internal/flags/flags_test.go b/internal/flags/flags_test.go
index abfab04b0..04aaabdc8 100644
--- a/internal/flags/flags_test.go
+++ b/internal/flags/flags_test.go
@@ -34,7 +34,6 @@ func homeDir() string {
 }
 
 func TestPathExpansion(t *testing.T) {
-	user, _ := user.Current()
 	var tests map[string]string
 
 	if runtime.GOOS == "windows" {
-- 
2.45.2


From 007918c4b7a9d736303d483d7026ee1ef43ec038 Mon Sep 17 00:00:00 2001
From: Michael Shaw <michael@abastionofsanity.com>
Date: Tue, 7 Mar 2023 13:20:35 -0500
Subject: [PATCH 5/5] do NOT run race tests

---
 .github/workflows/old_tests.yml | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/.github/workflows/old_tests.yml b/.github/workflows/old_tests.yml
index a7e4a8063..b3062aaee 100644
--- a/.github/workflows/old_tests.yml
+++ b/.github/workflows/old_tests.yml
@@ -39,27 +39,6 @@ jobs:
           make test
           
 
-  geth-unit-race-test:
-    name: Run geth unit test with race flag
-    runs-on: ubuntu-latest
-    env:
-      GO111MODULE: on
-    steps:
-      - name: Create GOPATH
-        run: mkdir -p /tmp/go
-
-      - uses: actions/setup-go@v3
-        with:
-          go-version: "1.18"
-          check-latest: true
-
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Run unit tests
-        run: |      
-          go run build/ci.go test -race
-
   statediff-unit-test:
     name: Run state diff unit test
     runs-on: ubuntu-latest
-- 
2.45.2