2 files changed, 112 insertions, 6 deletions
diff --git a/test/end-to-end/just-mr/TARGETS b/test/end-to-end/just-mr/TARGETS
index 7cdc9ba5..9f29bd03 100644
--- a/test/end-to-end/just-mr/TARGETS
+++ b/test/end-to-end/just-mr/TARGETS
@@ -67,10 +67,16 @@
   , "deps":
     [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
   }
+, "fetch-remote":
+  { "type": ["end-to-end", "with remote"]
+  , "name": ["fetch-remote"]
+  , "test": ["fetch-remote.sh"]
+  , "deps": [["end-to-end", "mr-tool-under-test"]]
+  }
 , "TESTS":
   { "type": "install"
   , "tainted": ["test"]
-  , "arguments_config": ["TEST_BOOTSTRAP_JUST_MR"]
+  , "arguments_config": ["TEST_BOOTSTRAP_JUST_MR", "TEST_COMPATIBLE_REMOTE"]
   , "deps":
     { "type": "++"
     , "$1":
@@ -79,11 +85,20 @@
         , "cond": {"type": "var", "name": "TEST_BOOTSTRAP_JUST_MR"}
         , "then": []
         , "else":
-          [ "install-roots-symlinks"
-          , "just_mr_mp"
-          , "git-tree-verbosity"
-          , "defaults"
-          ]
+          { "type": "++"
+          , "$1":
+            [ [ "install-roots-symlinks"
+              , "just_mr_mp"
+              , "git-tree-verbosity"
+              , "defaults"
+              ]
+            , { "type": "if"
+              , "cond": {"type": "var", "name": "TEST_COMPATIBLE_REMOTE"}
+              , "then": []
+              , "else": ["fetch-remote"]
+              }
+            ]
+          }
         }
       ]
     }
diff --git a/test/end-to-end/just-mr/fetch-remote.sh b/test/end-to-end/just-mr/fetch-remote.sh
new file mode 100644
index 00000000..8ebda3ad
--- /dev/null
+++ b/test/end-to-end/just-mr/fetch-remote.sh
@@ -0,0 +1,91 @@
+#!/bin/sh
+# Copyright 2023 Huawei Cloud Computing Technology Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+set -eu
+
+readonly JUST_MR="${PWD}/bin/mr-tool-under-test"
+readonly DISTDIR="${TEST_TMPDIR}/distfiles"
+readonly LBR="${TEST_TMPDIR}/local-build-root"
+readonly LOCAL_TMPDIR="${TEST_TMPDIR}/local-tmpdir"
+
+# A standard remote-execution server is given by the test infrastructure
+REMOTE_EXECUTION_ARGS="-r ${REMOTE_EXECUTION_ADDRESS}"
+
+# Setup archive to fetch
+mkdir -p "${DISTDIR}"
+mkdir -p foo/bar/baz
+echo "test data" > foo/bar/baz/data.txt
+tar cf "${DISTDIR}/foo-1.2.3.tar" foo 2>&1
+foocontent=$(git hash-object "${DISTDIR}/foo-1.2.3.tar")
+echo "Foo archive has content ${foocontent}"
+
+# Setup sample repository config
+touch ROOT
+cat > repos.json <<EOF
+{ "repositories":
+  { "foo":
+    { "repository":
+      { "type": "archive"
+      , "content": "${foocontent}"
+      , "fetch": "http://non-existent.example.org/foo-1.2.3.tar"
+      , "subdir": "foo"
+      }
+    }
+  , "":
+    { "repository": {"type": "file", "path": "."}
+    , "bindings": {"foo": "foo"}
+    }
+  }
+}
+EOF
+echo "Repository configuration:"
+cat repos.json
+
+
+
+# Call just-mr with distdir present, to make it aware of the file
+"${JUST_MR}" --norc --local-build-root "${LBR}" --distdir "${DISTDIR}" setup 2>&1
+
+# Remove distdir content
+rm -rf "${DISTDIR}"
+mkdir -p "${DISTDIR}"
+
+# Fetch to empty distdir while backing up to remote
+"${JUST_MR}" --norc --local-build-root "${LBR}" \
+             ${REMOTE_EXECUTION_ARGS} fetch -o "${DISTDIR}" --backup-to-remote 2>&1
+
+# Verify that the correct file is stored in the local tmpdir
+test -f "${DISTDIR}/foo-1.2.3.tar"
+newfoocontent=$(git hash-object "${DISTDIR}/foo-1.2.3.tar")
+echo "Foo archive has now content ${newfoocontent}"
+test "${newfoocontent}" = "${foocontent}"
+
+# Remove tmpdir content and also the build root
+rm -rf "${DISTDIR}"
+mkdir -p "${DISTDIR}"
+rm -rf "${LBR}"
+
+# Now fetch to empty tmpdir using only the remote backup
+"${JUST_MR}" --norc --local-build-root "${LBR}" \
+             ${REMOTE_EXECUTION_ARGS} fetch -o "${DISTDIR}" 2>&1
+
+# Verify that the correct file is stored in the local tmpdir
+test -f "${DISTDIR}/foo-1.2.3.tar"
+newfoocontent=$(git hash-object "${DISTDIR}/foo-1.2.3.tar")
+echo "Foo archive has now content ${newfoocontent}"
+test "${newfoocontent}" = "${foocontent}"
+
+echo OK