Skip to content

Commit f7782e2

Browse files
committed
Integration tests for http_request_timeout parameter (gcs/s3/alioss)
1 parent 2ba8c9a commit f7782e2

3 files changed

Lines changed: 44 additions & 0 deletions

File tree

alioss/integration/general_ali_test.go

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,33 @@ var _ = Describe("General testing for all Ali regions", func() {
194194
fileContent, _ := os.ReadFile(outputFilePath) //nolint:errcheck
195195
Expect(string(fileContent)).To(Equal("foo"))
196196
})
197+
198+
It("downloads a file when http_request_timeout is set", func() {
199+
outputFilePath := "/tmp/" + integration.GenerateRandomString()
200+
cfg := defaultConfig
201+
cfg.HTTPRequestTimeout = "30s"
202+
timeoutConfigPath := integration.MakeConfigFile(&cfg)
203+
204+
defer func() {
205+
cliSession, err := integration.RunCli(cliPath, timeoutConfigPath, storageType, "delete", blobName)
206+
Expect(err).ToNot(HaveOccurred())
207+
Expect(cliSession.ExitCode()).To(BeZero())
208+
209+
_ = os.Remove(outputFilePath) //nolint:errcheck
210+
_ = os.Remove(timeoutConfigPath) //nolint:errcheck
211+
}()
212+
213+
cliSession, err := integration.RunCli(cliPath, timeoutConfigPath, storageType, "put", contentFile, blobName)
214+
Expect(err).ToNot(HaveOccurred())
215+
Expect(cliSession.ExitCode()).To(BeZero())
216+
217+
cliSession, err = integration.RunCli(cliPath, timeoutConfigPath, storageType, "get", blobName, outputFilePath)
218+
Expect(err).ToNot(HaveOccurred())
219+
Expect(cliSession.ExitCode()).To(BeZero())
220+
221+
fileContent, _ := os.ReadFile(outputFilePath) //nolint:errcheck
222+
Expect(string(fileContent)).To(Equal("foo"))
223+
})
197224
})
198225

199226
Describe("Invoking `delete`", func() {

gcs/integration/gcs_general_test.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,15 @@ var _ = Describe("Integration", func() {
5050
},
5151
configurations)
5252

53+
DescribeTable("Blobstore lifecycle works with http_request_timeout set",
54+
func(cfg *config.GCSCli) {
55+
cfgCopy := *cfg
56+
cfgCopy.HTTPRequestTimeout = "30s"
57+
env.AddConfig(&cfgCopy)
58+
AssertLifecycleWorks(gcsCLIPath, env)
59+
},
60+
configurations)
61+
5362
DescribeTable("Delete silently ignores that the file doesn't exist",
5463
func(config *config.GCSCli) {
5564
env.AddConfig(config)

s3/integration/general_aws_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,14 @@ var _ = Describe("General testing for all AWS regions", Label("aws", "static", "
5959
func(cfg *config.S3Cli) { integration.AssertLifecycleWorks(s3CLIPath, cfg) },
6060
configurations,
6161
)
62+
DescribeTable("Blobstore lifecycle works with http_request_timeout set",
63+
func(cfg *config.S3Cli) {
64+
cfgCopy := *cfg
65+
cfgCopy.HTTPRequestTimeout = "30s"
66+
integration.AssertLifecycleWorks(s3CLIPath, &cfgCopy)
67+
},
68+
configurations,
69+
)
6270

6371
DescribeTable("Invoking `ensure-storage-exists` works",
6472
func(cfg *config.S3Cli) { integration.AssertOnStorageExists(s3CLIPath, cfg) },

0 commit comments

Comments
 (0)