From 55cac4c34da1076dec0c5c6b293eeef2fa8bd05e Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Sat, 8 Jun 2024 16:10:07 +0100
Subject: [PATCH] swift: fix integration tester with
 use_segments_container=false

---
 fstest/test_all/config.yaml                   |  2 +-
 fstest/testserver/init.d/PORTS.md             |  1 +
 fstest/testserver/init.d/TestSwiftAIOsegments | 24 +++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100755 fstest/testserver/init.d/TestSwiftAIOsegments

diff --git a/fstest/test_all/config.yaml b/fstest/test_all/config.yaml
index 826259d6e..4395a273a 100644
--- a/fstest/test_all/config.yaml
+++ b/fstest/test_all/config.yaml
@@ -279,7 +279,7 @@ backends:
    remote:   "TestSwiftAIO:"
    fastlist: true
  - backend:  "swift"
-   remote:   "TestSwiftAIO,use_segments_container=false:"
+   remote:   "TestSwiftAIOsegments:"
    fastlist: true
  - backend:  "swift"
    remote:   "TestSwift:"
diff --git a/fstest/testserver/init.d/PORTS.md b/fstest/testserver/init.d/PORTS.md
index f8e75c4e2..5d34fb612 100644
--- a/fstest/testserver/init.d/PORTS.md
+++ b/fstest/testserver/init.d/PORTS.md
@@ -25,6 +25,7 @@ They should be bound to localhost so they are not accessible externally.
 | 28629 | TestWebdavNextcloud |
 | 28630 | TestSMB |
 | 28631 | TestFTPProftpd |
+| 28632 | TestSwiftAIOsegments |
 | 38081 | TestWebdavOwncloud |
 
 ## Non localhost tests
diff --git a/fstest/testserver/init.d/TestSwiftAIOsegments b/fstest/testserver/init.d/TestSwiftAIOsegments
new file mode 100755
index 000000000..197487bcc
--- /dev/null
+++ b/fstest/testserver/init.d/TestSwiftAIOsegments
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -e
+
+NAME=swift-aio-segments
+PORT=28632
+
+. $(dirname "$0")/docker.bash
+
+start() {
+    docker run --rm -d --name ${NAME} \
+           -p 127.0.0.1:${PORT}:8080 \
+           bouncestorage/swift-aio
+    
+    echo type=swift
+    echo env_auth=false
+    echo user=test:tester
+    echo key=testing
+    echo auth=http://127.0.0.1:${PORT}/auth/v1.0
+    echo use_segments_container=false
+    echo _connect=127.0.0.1:${PORT}
+}
+
+. $(dirname "$0")/run.bash