From 867bd363fd49f23ba7ae9dfc25c23af7fe34fb1a Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Mon, 9 May 2022 11:48:40 +0100
Subject: [PATCH 1/4] Document need for public_baseurl to be correctly set.

---
 docs/integration_tests.md | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/docs/integration_tests.md b/docs/integration_tests.md
index 0fa1998499..b528724444 100644
--- a/docs/integration_tests.md
+++ b/docs/integration_tests.md
@@ -43,14 +43,17 @@ virtualenv -p python3 env
 source env/bin/activate
 pip install -e .
 demo/start.sh --no-rate-limit
+
 ```
 
-Alternatively, to install the latest Synapse release package (and not a cloned branch) you can run the following instead of `pip install -e .`:
+Alternatively, to install the latest Synapse release package (and not a cloned branch) you can run the following instead of `git clone` and `pip install -e .`:
 
 ```bash
 pip install matrix-synapse
 ```
 
+### Integration test failures
+
 You should now have 3 running federated Synapse instances 🎉, at http://127.0.0.1:8080/, http://127.0.0.1:8081/ and  http://127.0.0.1:8082/, which should display a "It Works! Synapse is running" message.
 
 ## Run the test
@@ -87,6 +90,18 @@ You'll need python3 to be able to run synapse
 
 Try on the Emulator browser to open "http://10.0.2.2:8080". You should see the "Synapse is running" message.
 
+### Tests partially run but some fail with "Unable to contact localhost:8080"
+
+This is because the `public_baseurl` of synapse is not consistent with the endpoint that the tests are connecting to.
+
+Ensure you have the following configuration in `demo/etc/8080.config`.
+
+```
+public_baseurl: http://10.0.2.2:8080/
+```
+
+After changing this you will need to restart synapse using `demo/stop.sh` and `demo/start.sh` to load the new configuration.
+
 ### virtualenv command fails
 
 You can try using

From 21fc4e31b4adea5f5a7432230121d97d2b569a22 Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Mon, 9 May 2022 11:54:59 +0100
Subject: [PATCH 2/4] Towncrier

---
 changelog.d/5973.doc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/5973.doc

diff --git a/changelog.d/5973.doc b/changelog.d/5973.doc
new file mode 100644
index 0000000000..cd3b31dd21
--- /dev/null
+++ b/changelog.d/5973.doc
@@ -0,0 +1 @@
+Note public_baseurl requirement in integration tests documentation.

From 37db397e06df372940b62fadb85da8210e181a33 Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Fri, 13 May 2022 11:40:26 +0100
Subject: [PATCH 3/4] Remove accidental header

---
 docs/integration_tests.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/integration_tests.md b/docs/integration_tests.md
index b528724444..68fcbe18e5 100644
--- a/docs/integration_tests.md
+++ b/docs/integration_tests.md
@@ -52,8 +52,6 @@ Alternatively, to install the latest Synapse release package (and not a cloned b
 pip install matrix-synapse
 ```
 
-### Integration test failures
-
 You should now have 3 running federated Synapse instances 🎉, at http://127.0.0.1:8080/, http://127.0.0.1:8081/ and  http://127.0.0.1:8082/, which should display a "It Works! Synapse is running" message.
 
 ## Run the test

From 2bd89e6ec09918db9e7006b8b25f31361f831e90 Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Fri, 13 May 2022 11:44:47 +0100
Subject: [PATCH 4/4] Note in installation section the need to change
 public_baseurl as well.

---
 docs/integration_tests.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/integration_tests.md b/docs/integration_tests.md
index 68fcbe18e5..e79f966d1f 100644
--- a/docs/integration_tests.md
+++ b/docs/integration_tests.md
@@ -52,6 +52,8 @@ Alternatively, to install the latest Synapse release package (and not a cloned b
 pip install matrix-synapse
 ```
 
+On your first run, you will want to stop the demo and edit the config to correct the `public_baseurl` to http://10.0.2.2:8080 and restart the server.
+
 You should now have 3 running federated Synapse instances 🎉, at http://127.0.0.1:8080/, http://127.0.0.1:8081/ and  http://127.0.0.1:8082/, which should display a "It Works! Synapse is running" message.
 
 ## Run the test