try fixing ci

Author: rotmanjanez

.github/actions/provision-zulip/action.yml

@@ -135,28 +135,3 @@ runs:
       run: |
         echo "site_url=${ZULIP_URL}" >> "$GITHUB_OUTPUT"
         echo "log_path=${ZULIP_DEV_LOG}" >> "$GITHUB_OUTPUT"
-
-    - name: Upload Zulip log
-      if: always()
-      uses: actions/upload-artifact@v4
-      with:
-        name: zulip-log-${{ inputs.zulip_ref }}-${{ github.job }}-${{ github.run_attempt }}
-        path: ${{ env.ZULIP_DEV_LOG }}
-        if-no-files-found: ignore
-        retention-days: 7
-
-    - name: Show log on failure
-      if: failure()
-      shell: bash
-      run: |
-        echo "===== zulip-dev.log ====="
-        tail -n +1 "${ZULIP_DEV_LOG}" || true
-
-    - name: Stop Zulip
-      if: always()
-      shell: bash
-      run: |
-        if [ -f "${ZULIP_RUN_PID}" ]; then
-          kill "$(cat "${ZULIP_RUN_PID}")" || true
-        fi
-        pkill -f "tools/run-dev" || true

.github/actions/stop-zulip/action.yaml

@@ -0,0 +1,36 @@
+name: Stop Zulip
+description: Collect logs and shut down a Zulip dev server
+
+inputs:
+  zulip_ref:
+    description: Zulip git ref (branch/tag/commit)
+    required: false
+    default: main
+
+runs:
+  using: composite
+  steps:
+    - name: Upload Zulip log
+      if: always()
+      uses: actions/upload-artifact@v4
+      with:
+        name: zulip-log-${{ inputs.zulip_ref }}-${{ github.job }}-${{ github.run_attempt }}
+        path: ${{ env.ZULIP_DEV_LOG }}
+        if-no-files-found: ignore
+        retention-days: 7
+
+    - name: Show log on failure
+      if: failure()
+      shell: bash
+      run: |
+        echo "===== zulip-dev.log ====="
+        tail -n +1 "${ZULIP_DEV_LOG}" || true
+
+    - name: Stop Zulip
+      if: always()
+      shell: bash
+      run: |
+        if [ -f "${ZULIP_RUN_PID}" ]; then
+          kill "$(cat "${ZULIP_RUN_PID}")" || true
+        fi
+        pkill -f "tools/run-dev" || true

.github/workflows/integration-tests.yml

@@ -56,12 +56,6 @@ jobs:
         with:
           zulip_ref: ${{ matrix.zulip_ref }}
 
-      - name: Give Zulip some time to settle
-        shell: bash
-        run: |
-          echo "Waiting 30 seconds for Zulip to settle..."
-          sleep 30
-
       - name: Run go test suite with coverage
         run: go test ./... -covermode=atomic -coverprofile=coverage.out -timeout 60m
 
@@ -77,6 +71,12 @@ jobs:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
           ZULIP_BRANCH: ${{ matrix.zulip_ref }}
 
+      - name: Stop Zulip
+        if: always()
+        uses: ./.github/actions/stop-zulip
+        with:
+          zulip_ref: ${{ matrix.zulip_ref }}
+
   godoc:
     name: Godoc
     runs-on: arc-runner-set

internal/test_utils/utils.go

@@ -9,7 +9,6 @@ import (
 	"io"
 	"math/rand/v2"
 	"mime/multipart"
-	"net"
 	"net/http"
 	"net/url"
 	"os"
@@ -86,7 +85,6 @@ func GetBotClient(t *testing.T) client.Client {
 	t.Helper()
 	rc := createBot(t, "test-bot")
 	client, err := client.NewClient(rc,
-		client.WithHTTPClient(newHTTPClientForTestSite()),
 		client.SkipWarnOnInsecureTLS(),
 		client.EnableStatistics())
 	require.NoError(t, err)
@@ -193,49 +191,14 @@ func getTestClient(t *testing.T, username string) (*z.RC, client.Client) {
 
 	apiClient, err := client.NewTestClient(rc,
 		client.SkipWarnOnInsecureTLS(),
-		client.EnableStatistics(),
-		client.WithHTTPClient(newHTTPClientForTestSite()))
+		client.EnableStatistics())
 	if err != nil {
 		t.Fatalf("Failed to create z.client: %v", err)
 	}
 
 	return rc, apiClient
 }
 
-func newHTTPClientForTestSite() *http.Client {
-	const timeout = 30 * time.Second
-	const keepAlive = 30 * time.Second
-
-	baseTransport, ok := http.DefaultTransport.(*http.Transport)
-	if !ok {
-		panic("default transport is not an *http.Transport")
-	}
-
-	transport := baseTransport.Clone()
-	dialer := &net.Dialer{
-		Timeout:   timeout,
-		KeepAlive: keepAlive,
-	}
-
-	transport.DialContext = func(ctx context.Context, network, address string) (net.Conn, error) {
-		host, port, err := net.SplitHostPort(address)
-		if err != nil {
-			return nil, err
-		}
-		if host == "localhost" || host == "::1" {
-			host = "127.0.0.1"
-		}
-		return dialer.DialContext(ctx, network, net.JoinHostPort(host, port))
-	}
-
-	return &http.Client{
-		Transport:     transport,
-		Timeout:       http.DefaultClient.Timeout,
-		CheckRedirect: http.DefaultClient.CheckRedirect,
-		Jar:           http.DefaultClient.Jar,
-	}
-}
-
 type UserInfo struct {
 	APIKey string `json:"api_key"`
 	EMail  string `json:"email"`
@@ -251,10 +214,7 @@ func fetchUserInfo(t *testing.T, username string) UserInfo {
 		attemptDelay = 3 * time.Second
 	)
 
-	httpClient := newHTTPClientForTestSite()
-	if httpClient == nil {
-		httpClient = http.DefaultClient
-	}
+	httpClient := http.DefaultClient
 
 	for attempt := range numAttempts {
 		info, done := getUserInfo(t, httpClient, username, attempt)
@@ -303,7 +263,7 @@ func getUserInfo(t *testing.T, client *http.Client, username string, attempt int
 			t.Fatalf("Empty API key received for user %s", username)
 		}
 		if result.EMail != username {
-			t.Fatalf("Unexpected email in API key Response: got %s, want %s", result.EMail, username)
+			t.Fatalf("Unexpected email in API key response: got %s, want %s", result.EMail, username)
 		}
 		return result, true
 	}
@@ -436,9 +396,7 @@ func createBot(t *testing.T, botName string) *z.RC {
 	req.SetBasicAuth(rc.Email, rc.APIKey)
 	req.Header.Set("Content-Type", w.FormDataContentType())
 
-	httpClient := newHTTPClientForTestSite()
-
-	resp, err := httpClient.Do(req)
+	resp, err := http.DefaultClient.Do(req)
 	require.NoError(t, err)
 	defer resp.Body.Close()