From 0e2ef6c8744f1e88d208748fe0a21b2501e066ad Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Fri, 10 Oct 2025 22:43:06 +0100 Subject: [PATCH] upload test: Try longer delay Also renames test to 0000-upload so it is run earlier --- tests/integration/tests/{upload => 0000-upload}/Main.hs | 4 +++- .../tests/{upload => 0000-upload}/files/FakeHackage.hs | 0 .../tests/{upload => 0000-upload}/files/FakeHackageStart.hs | 0 tests/integration/tests/{upload => 0000-upload}/files/Foo.hs | 0 .../tests/{upload => 0000-upload}/files/gpg-disabled/gpg | 0 .../tests/{upload => 0000-upload}/files/gpg-disabled/gpg.bat | 0 tests/integration/tests/0000-upload/files/gpg-disabled/gpg2 | 1 + .../tests/{upload => 0000-upload}/files/gpg-disabled/gpg2.bat | 0 .../tests/{upload => 0000-upload}/files/stack.yaml | 0 .../tests/{upload => 0000-upload}/files/uploadtest.cabal | 0 tests/integration/tests/upload/files/gpg-disabled/gpg2 | 1 - 11 files changed, 4 insertions(+), 2 deletions(-) rename tests/integration/tests/{upload => 0000-upload}/Main.hs (94%) rename tests/integration/tests/{upload => 0000-upload}/files/FakeHackage.hs (100%) rename tests/integration/tests/{upload => 0000-upload}/files/FakeHackageStart.hs (100%) rename tests/integration/tests/{upload => 0000-upload}/files/Foo.hs (100%) rename tests/integration/tests/{upload => 0000-upload}/files/gpg-disabled/gpg (100%) rename tests/integration/tests/{upload => 0000-upload}/files/gpg-disabled/gpg.bat (100%) create mode 100644 tests/integration/tests/0000-upload/files/gpg-disabled/gpg2 rename tests/integration/tests/{upload => 0000-upload}/files/gpg-disabled/gpg2.bat (100%) rename tests/integration/tests/{upload => 0000-upload}/files/stack.yaml (100%) rename tests/integration/tests/{upload => 0000-upload}/files/uploadtest.cabal (100%) delete mode 120000 tests/integration/tests/upload/files/gpg-disabled/gpg2 diff --git a/tests/integration/tests/upload/Main.hs b/tests/integration/tests/0000-upload/Main.hs similarity index 94% rename from tests/integration/tests/upload/Main.hs rename to tests/integration/tests/0000-upload/Main.hs index 2a7e47dc38..1751ae2c14 100644 --- a/tests/integration/tests/upload/Main.hs +++ b/tests/integration/tests/0000-upload/Main.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NumericUnderscores #-} + import Control.Concurrent import StackTest @@ -28,7 +30,7 @@ withFakeHackage act = do -- Start the fake server withCreateProcess (proc stackEnv $ withNetworkArgs ++ ["FakeHackage.hs"]) $ \_ _ _ _ -> do -- Wait for the fake server to start accepting requests - threadDelay 3000000 + threadDelay 10_000_000 act where withNetworkArgs = ["runghc", "--package", "network"] diff --git a/tests/integration/tests/upload/files/FakeHackage.hs b/tests/integration/tests/0000-upload/files/FakeHackage.hs similarity index 100% rename from tests/integration/tests/upload/files/FakeHackage.hs rename to tests/integration/tests/0000-upload/files/FakeHackage.hs diff --git a/tests/integration/tests/upload/files/FakeHackageStart.hs b/tests/integration/tests/0000-upload/files/FakeHackageStart.hs similarity index 100% rename from tests/integration/tests/upload/files/FakeHackageStart.hs rename to tests/integration/tests/0000-upload/files/FakeHackageStart.hs diff --git a/tests/integration/tests/upload/files/Foo.hs b/tests/integration/tests/0000-upload/files/Foo.hs similarity index 100% rename from tests/integration/tests/upload/files/Foo.hs rename to tests/integration/tests/0000-upload/files/Foo.hs diff --git a/tests/integration/tests/upload/files/gpg-disabled/gpg b/tests/integration/tests/0000-upload/files/gpg-disabled/gpg similarity index 100% rename from tests/integration/tests/upload/files/gpg-disabled/gpg rename to tests/integration/tests/0000-upload/files/gpg-disabled/gpg diff --git a/tests/integration/tests/upload/files/gpg-disabled/gpg.bat b/tests/integration/tests/0000-upload/files/gpg-disabled/gpg.bat similarity index 100% rename from tests/integration/tests/upload/files/gpg-disabled/gpg.bat rename to tests/integration/tests/0000-upload/files/gpg-disabled/gpg.bat diff --git a/tests/integration/tests/0000-upload/files/gpg-disabled/gpg2 b/tests/integration/tests/0000-upload/files/gpg-disabled/gpg2 new file mode 100644 index 0000000000..a7506d694e --- /dev/null +++ b/tests/integration/tests/0000-upload/files/gpg-disabled/gpg2 @@ -0,0 +1 @@ +gpg \ No newline at end of file diff --git a/tests/integration/tests/upload/files/gpg-disabled/gpg2.bat b/tests/integration/tests/0000-upload/files/gpg-disabled/gpg2.bat similarity index 100% rename from tests/integration/tests/upload/files/gpg-disabled/gpg2.bat rename to tests/integration/tests/0000-upload/files/gpg-disabled/gpg2.bat diff --git a/tests/integration/tests/upload/files/stack.yaml b/tests/integration/tests/0000-upload/files/stack.yaml similarity index 100% rename from tests/integration/tests/upload/files/stack.yaml rename to tests/integration/tests/0000-upload/files/stack.yaml diff --git a/tests/integration/tests/upload/files/uploadtest.cabal b/tests/integration/tests/0000-upload/files/uploadtest.cabal similarity index 100% rename from tests/integration/tests/upload/files/uploadtest.cabal rename to tests/integration/tests/0000-upload/files/uploadtest.cabal diff --git a/tests/integration/tests/upload/files/gpg-disabled/gpg2 b/tests/integration/tests/upload/files/gpg-disabled/gpg2 deleted file mode 120000 index a7506d694e..0000000000 --- a/tests/integration/tests/upload/files/gpg-disabled/gpg2 +++ /dev/null @@ -1 +0,0 @@ -gpg \ No newline at end of file