From 293c20bd44ae438da1c87e9001e11a8d9f427d9e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 10 Aug 2023 20:20:21 -0600
Subject: [PATCH] chmod temp test files because GHA uses a different user
and Go creates them as 0600
---
.github/workflows/main.yml | 2 +-
test/test_internals/deps_docker_context.go | 4 ++++
test/test_internals/deps_minio.go | 4 ++++
test/test_internals/deps_mmr.go | 4 ++++
test/test_internals/deps_synapse.go | 4 ++++
5 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index dd9a3198..226f4c1c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,5 +11,5 @@ jobs:
with:
go-version: '1.20'
- run: './build.sh' # verify the thing compiles first
- - run: 'go test -c -v ./test && ./test.test'
+ - run: 'go test -c -v ./test && ./test.test' # cheat and work around working directory issues
timeout-minutes: 30
diff --git a/test/test_internals/deps_docker_context.go b/test/test_internals/deps_docker_context.go
index 73b36d7d..f83b7e79 100644
--- a/test/test_internals/deps_docker_context.go
+++ b/test/test_internals/deps_docker_context.go
@@ -21,6 +21,10 @@ func createDockerContext() (*os.File, error) {
if err != nil {
return nil, err
}
+ err = tmpF.Chmod(0644)
+ if err != nil {
+ return nil, err
+ }
tarContext := tar.NewWriter(tmpF)
err = filepath.WalkDir(".", func(path string, d fs.DirEntry, err error) error {
diff --git a/test/test_internals/deps_minio.go b/test/test_internals/deps_minio.go
index e00e04ef..15b1eddb 100644
--- a/test/test_internals/deps_minio.go
+++ b/test/test_internals/deps_minio.go
@@ -85,6 +85,10 @@ func MakeMinio(depNet *NetworkDep) (*MinioDep, error) {
if err != nil {
return nil, err
}
+ err = f.Chmod(0644)
+ if err != nil {
+ return nil, err
+ }
_, err = f.Write([]byte(strings.ReplaceAll(w.String(), "\r\n", "\n"))) // dos2unix now instead of in the container
if err != nil {
return nil, err
diff --git a/test/test_internals/deps_mmr.go b/test/test_internals/deps_mmr.go
index d0bad936..9e74a7f5 100644
--- a/test/test_internals/deps_mmr.go
+++ b/test/test_internals/deps_mmr.go
@@ -97,6 +97,10 @@ func writeMmrConfig(tmplArgs mmrTmplArgs) (string, error) {
if err != nil {
return "", err
}
+ err = f.Chmod(0644)
+ if err != nil {
+ return "", err
+ }
_, err = f.Write([]byte(w.String()))
if err != nil {
return "", err
diff --git a/test/test_internals/deps_synapse.go b/test/test_internals/deps_synapse.go
index 8dc2ca21..2a755d89 100644
--- a/test/test_internals/deps_synapse.go
+++ b/test/test_internals/deps_synapse.go
@@ -84,6 +84,10 @@ func MakeSynapse(domainName string, depNet *NetworkDep) (*SynapseDep, error) {
if err != nil {
return nil, err
}
+ err = f.Chmod(0644)
+ if err != nil {
+ return nil, err
+ }
_, err = f.Write([]byte(w.String()))
if err != nil {
return nil, err
--
GitLab