]> source.dussan.org Git - gitea.git/commitdiff
Do not show full lfs file on error in git_test.go:rawTest() (#14980)
authorzeripath <art27@cantab.net>
Sun, 14 Mar 2021 15:53:59 +0000 (15:53 +0000)
committerGitHub <noreply@github.com>
Sun, 14 Mar 2021 15:53:59 +0000 (15:53 +0000)
If there is a problem uploading to LFS it is possible for the raw
endpoint to return a very large file when a pointer file is expected
This will then cause the drone logs to fill up unnecessarily with
the contents of the very large file.

If the file returned from raw is of the incorrect size we should
therefore not test it see if it contains the pointer file
and just declare that it is incorrect.

Signed-off-by: Andrew Thornton <art27@cantab.net>
integrations/git_test.go

index 705bd08c1183c0b500d4a49cfc84b0680f9ab146..f22b1cd9f2de2509f5fd76b3d06e51c15fc747a9 100644 (file)
@@ -216,7 +216,10 @@ func rawTest(t *testing.T, ctx *APITestContext, little, big, littleLFS, bigLFS s
                        req = NewRequest(t, "GET", path.Join("/", username, reponame, "/raw/branch/master/", littleLFS))
                        resp = session.MakeRequest(t, req, http.StatusOK)
                        assert.NotEqual(t, littleSize, resp.Body.Len())
-                       assert.Contains(t, resp.Body.String(), models.LFSMetaFileIdentifier)
+                       assert.LessOrEqual(t, resp.Body.Len(), 1024)
+                       if resp.Body.Len() != littleSize && resp.Body.Len() <= 1024 {
+                               assert.Contains(t, resp.Body.String(), models.LFSMetaFileIdentifier)
+                       }
                }
 
                if !testing.Short() {
@@ -228,7 +231,9 @@ func rawTest(t *testing.T, ctx *APITestContext, little, big, littleLFS, bigLFS s
                                req = NewRequest(t, "GET", path.Join("/", username, reponame, "/raw/branch/master/", bigLFS))
                                resp = session.MakeRequest(t, req, http.StatusOK)
                                assert.NotEqual(t, bigSize, resp.Body.Len())
-                               assert.Contains(t, resp.Body.String(), models.LFSMetaFileIdentifier)
+                               if resp.Body.Len() != bigSize && resp.Body.Len() <= 1024 {
+                                       assert.Contains(t, resp.Body.String(), models.LFSMetaFileIdentifier)
+                               }
                        }
                }
        })