From 3e8cf5fcd4eb2fb6dafa120abbc6f7e6c7872480 Mon Sep 17 00:00:00 2001 From: monalisa Date: Mon, 31 Jul 2023 11:26:31 +0200 Subject: [PATCH 1/2] Fix failing fs mkdir test on azure --- internal/fs_mkdir_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/fs_mkdir_test.go b/internal/fs_mkdir_test.go index 32d1d9c8b6..69500e4842 100644 --- a/internal/fs_mkdir_test.go +++ b/internal/fs_mkdir_test.go @@ -112,6 +112,6 @@ func TestAccFsMkdirWhenFileExistsAtPath(t *testing.T) { // assert run fails _, _, err = RequireErrorRun(t, "fs", "mkdir", "dbfs:"+path.Join(tmpDir, "hello")) // Different cloud providers return different errors. - regex := regexp.MustCompile(`^Path is a file: .*$|^Cannot create directory .* because .* is an existing file$|^mkdirs\(hadoopPath: .*, permission: rwxrwxrwx\): failed$`) + regex := regexp.MustCompile(`^Path is a file: .*$|^Cannot create directory .* because .* is an existing file.$|^mkdirs\(hadoopPath: .*, permission: rwxrwxrwx\): failed$`) assert.Regexp(t, regex, err.Error()) } From e9706769e2b4c29adf6e7fa30cf8820ccb3e3f2d Mon Sep 17 00:00:00 2001 From: monalisa Date: Mon, 31 Jul 2023 11:33:55 +0200 Subject: [PATCH 2/2] - --- internal/fs_mkdir_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/fs_mkdir_test.go b/internal/fs_mkdir_test.go index 69500e4842..83417c136c 100644 --- a/internal/fs_mkdir_test.go +++ b/internal/fs_mkdir_test.go @@ -112,6 +112,6 @@ func TestAccFsMkdirWhenFileExistsAtPath(t *testing.T) { // assert run fails _, _, err = RequireErrorRun(t, "fs", "mkdir", "dbfs:"+path.Join(tmpDir, "hello")) // Different cloud providers return different errors. - regex := regexp.MustCompile(`^Path is a file: .*$|^Cannot create directory .* because .* is an existing file.$|^mkdirs\(hadoopPath: .*, permission: rwxrwxrwx\): failed$`) + regex := regexp.MustCompile(`^Path is a file: .*$|^Cannot create directory .* because .* is an existing file\.$|^mkdirs\(hadoopPath: .*, permission: rwxrwxrwx\): failed$`) assert.Regexp(t, regex, err.Error()) }