t: remove xfail from REVIEW t006 and t007

Hardcoded 10 second timeout on no connection instead of waiting
forever.

.gitea/workflows/t.yaml

@@ -45,6 +45,21 @@ jobs:
       - name: Run tests
         run: py.test-3.11 -v tests
         working-directory: ./autogits/integration
+      - name: workflow pr log
+        if: failure()
+        run: podman ps
+      - name: workflow pr log
+        if: failure()
+        run: |
+          bash -cx 'podman logs workflow-pr >&2'
+      - name: gitea log
+        if: failure()
+        run: |
+          bash -cx 'podman logs gitea-test >&2' 
+      - name: gitea publisher log
+        if: failure()
+        run: |
+          bash -cx 'podman logs gitea-publisher >&2'
       - name: Make sure the pod is down
         if: always()
         run: make down

gitea-events-rabbitmq-publisher/rabbitmq.go

@@ -92,10 +92,13 @@ func ConnectToExchangeForPublish(host, username, password string) {
 		auth = username + ":" + password + "@"
 	}
 
-	connection, err := rabbitmq.DialTLS("amqps://"+auth+host, &tls.Config{
-		ServerName: host,
+	connection, err := rabbitmq.DialConfig("amqps://"+auth+host, rabbitmq.Config{
+		Dial: rabbitmq.DefaultDial(10 * time.Second),
+		TLSClientConfig: &tls.Config{
+			ServerName: host,
+		},
 	})
-	failOnError(err, "Cannot connect to rabbit.opensuse.org")
+	failOnError(err, "Cannot connect to "+host)
 	defer connection.Close()
 
 	ch, err := connection.Channel()

integration/tests/workflow_pr_review_test.py

@@ -155,7 +155,6 @@ index 0000000..e69de29
 
 
 @pytest.mark.t005
-# @pytest.mark.xfail(reason="TBD troubleshoot")
 def test_005_any_maintainer_approval_sufficient(maintainer_env, ownerA_client, ownerBB_client):
     """
     Test scenario:
@@ -233,7 +232,6 @@ index 0000000..e69de29
 
 
 @pytest.mark.t006
-@pytest.mark.xfail(reason="tbd flacky in ci")
 def test_006_maintainer_rejection_removes_other_requests(maintainer_env, ownerA_client, ownerBB_client):
     """
     Test scenario:
@@ -287,7 +285,6 @@ index 0000000..e69de29
 
 
 @pytest.mark.t007
-@pytest.mark.xfail(reason="TBD troubleshoot")
 def test_007_review_required_needs_all_approvals(review_required_env, ownerA_client, ownerBB_client):
     """
     Test scenario:

workflow-pr/pr_processor.go

@@ -470,7 +470,8 @@ func (pr *PRProcessor) Process(req *models.PullRequest) error {
 				if pr.PR.State == "open" {
 					org, repo, idx := pr.PRComponents()
 					if prjGitPR.PR.HasMerged {
-						Gitea.AddComment(pr.PR, "This PR is merged via the associated Project PR.")
+						// TODO: use timeline here because this can spam if ManualMergePR fails
+						// Gitea.AddComment(pr.PR, "This PR is merged via the associated Project PR.")
 						err = Gitea.ManualMergePR(org, repo, idx, pr.PR.Head.Sha, false)
 						if _, ok := err.(*repository.RepoMergePullRequestConflict); !ok {
 							common.PanicOnError(err)