diff options
| author | Côme Chilliet <91878298+come-nc@users.noreply.github.com> | 2023-11-14 10:50:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-14 10:50:31 +0100 |
| commit | 70acf44a45c9139b0b26ab99c55e352cd0f2b073 (patch) | |
| tree | fa8954ad3f37e9fc1eee41af1cbf4bd4a18ccfda /core | |
| parent | be76f0d08840edd186987934f0bb9b557a39c18e (diff) | |
| parent | 749523603403f11c2958a51fb64a7035d9f4eb73 (diff) | |
| download | nextcloud-server-70acf44a45c9139b0b26ab99c55e352cd0f2b073.tar.gz nextcloud-server-70acf44a45c9139b0b26ab99c55e352cd0f2b073.zip | |
Merge pull request #41086 from nextcloud/feat/migrate-memory-limit-setup-check
Migrate memory_limit check to new SetupCheck API
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/setupchecks.js | 6 | ||||
| -rw-r--r-- | core/js/tests/specs/setupchecksSpec.js | 31 |
2 files changed, 12 insertions, 25 deletions
diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js index f5ac8575365..2c487e10997 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -355,12 +355,6 @@ type: OC.SetupChecks.MESSAGE_TYPE_WARNING }) } - if (!data.isMemoryLimitSufficient) { - messages.push({ - msg: t('core', 'The PHP memory limit is below the recommended value of 512MB.'), - type: OC.SetupChecks.MESSAGE_TYPE_ERROR - }) - } if(data.appDirsWithDifferentOwner && data.appDirsWithDifferentOwner.length > 0) { var appDirsWithDifferentOwner = data.appDirsWithDifferentOwner.reduce( diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js index 246574653a9..88c455974bd 100644 --- a/core/js/tests/specs/setupchecksSpec.js +++ b/core/js/tests/specs/setupchecksSpec.js @@ -237,7 +237,6 @@ describe('OC.SetupChecks tests', function() { cronInfo: { diffInSeconds: 0 }, - isMemoryLimitSufficient: true, appDirsWithDifferentOwner: [], isImagickEnabled: true, areWebauthnExtensionsEnabled: true, @@ -292,7 +291,6 @@ describe('OC.SetupChecks tests', function() { cronInfo: { diffInSeconds: 0 }, - isMemoryLimitSufficient: true, appDirsWithDifferentOwner: [], isImagickEnabled: true, areWebauthnExtensionsEnabled: true, @@ -347,7 +345,6 @@ describe('OC.SetupChecks tests', function() { cronInfo: { diffInSeconds: 0 }, - isMemoryLimitSufficient: true, appDirsWithDifferentOwner: [], isImagickEnabled: true, areWebauthnExtensionsEnabled: true, @@ -402,7 +399,6 @@ describe('OC.SetupChecks tests', function() { cronInfo: { diffInSeconds: 0 }, - isMemoryLimitSufficient: true, appDirsWithDifferentOwner: [], isImagickEnabled: true, areWebauthnExtensionsEnabled: true, @@ -455,7 +451,6 @@ describe('OC.SetupChecks tests', function() { cronInfo: { diffInSeconds: 0 }, - isMemoryLimitSufficient: true, appDirsWithDifferentOwner: [ '/some/path' ], @@ -511,7 +506,6 @@ describe('OC.SetupChecks tests', function() { cronInfo: { diffInSeconds: 0 }, - isMemoryLimitSufficient: true, appDirsWithDifferentOwner: [], isImagickEnabled: true, areWebauthnExtensionsEnabled: true, @@ -567,7 +561,6 @@ describe('OC.SetupChecks tests', function() { cronInfo: { diffInSeconds: 0 }, - isMemoryLimitSufficient: true, appDirsWithDifferentOwner: [], isImagickEnabled: true, areWebauthnExtensionsEnabled: true, @@ -621,7 +614,6 @@ describe('OC.SetupChecks tests', function() { cronInfo: { diffInSeconds: 0 }, - isMemoryLimitSufficient: true, appDirsWithDifferentOwner: [], isImagickEnabled: true, areWebauthnExtensionsEnabled: true, @@ -675,7 +667,6 @@ describe('OC.SetupChecks tests', function() { cronInfo: { diffInSeconds: 0 }, - isMemoryLimitSufficient: false, appDirsWithDifferentOwner: [], isImagickEnabled: true, areWebauthnExtensionsEnabled: true, @@ -692,6 +683,18 @@ describe('OC.SetupChecks tests', function() { linkToDoc: null } }, + php: { + "Internet connectivity": { + severity: "success", + description: null, + linkToDoc: null + }, + "PHP memory limit": { + severity: "error", + description: "The PHP memory limit is below the recommended value of 512MB.", + linkToDoc: null + }, + }, }, }) ); @@ -748,7 +751,6 @@ describe('OC.SetupChecks tests', function() { cronInfo: { diffInSeconds: 0 }, - isMemoryLimitSufficient: true, appDirsWithDifferentOwner: [], isImagickEnabled: true, areWebauthnExtensionsEnabled: true, @@ -808,7 +810,6 @@ describe('OC.SetupChecks tests', function() { cronInfo: { diffInSeconds: 0 }, - isMemoryLimitSufficient: true, appDirsWithDifferentOwner: [], isImagickEnabled: true, areWebauthnExtensionsEnabled: true, @@ -861,7 +862,6 @@ describe('OC.SetupChecks tests', function() { cronInfo: { diffInSeconds: 0 }, - isMemoryLimitSufficient: true, appDirsWithDifferentOwner: [], isImagickEnabled: true, areWebauthnExtensionsEnabled: true, @@ -918,7 +918,6 @@ describe('OC.SetupChecks tests', function() { cronInfo: { diffInSeconds: 0 }, - isMemoryLimitSufficient: true, appDirsWithDifferentOwner: [], isImagickEnabled: true, areWebauthnExtensionsEnabled: true, @@ -972,7 +971,6 @@ describe('OC.SetupChecks tests', function() { cronInfo: { diffInSeconds: 0 }, - isMemoryLimitSufficient: true, appDirsWithDifferentOwner: [], isImagickEnabled: true, areWebauthnExtensionsEnabled: true, @@ -1023,7 +1021,6 @@ describe('OC.SetupChecks tests', function() { cronInfo: { diffInSeconds: 0 }, - isMemoryLimitSufficient: true, appDirsWithDifferentOwner: [], isImagickEnabled: true, areWebauthnExtensionsEnabled: true, @@ -1077,7 +1074,6 @@ describe('OC.SetupChecks tests', function() { cronInfo: { diffInSeconds: 0 }, - isMemoryLimitSufficient: true, appDirsWithDifferentOwner: [], isImagickEnabled: false, areWebauthnExtensionsEnabled: true, @@ -1131,7 +1127,6 @@ describe('OC.SetupChecks tests', function() { cronInfo: { diffInSeconds: 0 }, - isMemoryLimitSufficient: true, appDirsWithDifferentOwner: [], isImagickEnabled: true, areWebauthnExtensionsEnabled: false, @@ -1184,7 +1179,6 @@ describe('OC.SetupChecks tests', function() { cronInfo: { diffInSeconds: 0 }, - isMemoryLimitSufficient: true, appDirsWithDifferentOwner: [], isImagickEnabled: true, areWebauthnExtensionsEnabled: true, @@ -1244,7 +1238,6 @@ describe('OC.SetupChecks tests', function() { cronInfo: { diffInSeconds: 0 }, - isMemoryLimitSufficient: true, appDirsWithDifferentOwner: [], isImagickEnabled: true, areWebauthnExtensionsEnabled: true, |