Skip SqlContentEntityStorageRevisionDataCleanupTest (#338)

mondrake · Oct 27, 2023 · 13c4421 · 13c4421
1 parent fc74b6e
commit 13c4421
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 25 deletions.
diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
@@ -13,6 +13,7 @@ env:
     PHPUNIT_SKIP_CLASS: '[
       "Drupal\\KernelTests\\Core\\Cache\\ApcuBackendTest",
       "Drupal\\Tests\\file\\Functional\\FileAddPermissionsUpdateTest"
+      "Drupal\\Tests\\system\\Functional\\Update\\SqlContentEntityStorageRevisionDataCleanupTest"
     ]'
 
 jobs:

diff --git a/.github/workflows/mysqli.yml b/.github/workflows/mysqli.yml
@@ -13,6 +13,7 @@ env:
     PHPUNIT_SKIP_CLASS: '[
       "Drupal\\KernelTests\\Core\\Cache\\ApcuBackendTest",
       "Drupal\\Tests\\file\\Functional\\FileAddPermissionsUpdateTest"
+      "Drupal\\Tests\\system\\Functional\\Update\\SqlContentEntityStorageRevisionDataCleanupTest"
     ]'
 
 jobs:

diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml
@@ -13,6 +13,7 @@ env:
     PHPUNIT_SKIP_CLASS: '[
       "Drupal\\KernelTests\\Core\\Cache\\ApcuBackendTest",
       "Drupal\\Tests\\file\\Functional\\FileAddPermissionsUpdateTest"
+      "Drupal\\Tests\\system\\Functional\\Update\\SqlContentEntityStorageRevisionDataCleanupTest"
     ]'
 
 jobs:

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -30,11 +30,11 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.1"
+#          - "8.1"
           - "8.2"
         test-args:
           - "--group Database"
-          - "--group Entity"
+#          - "--group Entity"
 #          - "--group Cache,Config"
 #          - "--group field,Field"
 #          - "--group file"
@@ -83,5 +83,12 @@ jobs:
         vendor/bin/drush core:requirements
         vendor/bin/drush pml --type=module --no-core
 
-    - name: Run test ${{ matrix.test-args }}
-      run: vendor/bin/phpunit -c core --color=always ${{ matrix.test-args }}
+    - name: Run test
+      continue-on-error: true
+      run: vendor/bin/phpunit -c core --color=always core/modules/system/tests/src/Functional/Update/SqlContentEntityStorageRevisionDataCleanupTest.php
+
+    - name: Test artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: test-results
+        path: sites/simpletest/browser_output
diff --git a/.github/workflows/sqlite.yml b/.github/workflows/sqlite.yml
@@ -13,7 +13,8 @@ env:
     PHPUNIT_SKIP_CLASS: '[
       "Drupal\\KernelTests\\Core\\Cache\\ApcuBackendTest",
       "Drupal\\Tests\\file\\Functional\\FileAddPermissionsUpdateTest",
-      "Drupal\\Tests\\file\\Functional\\DownloadTest"
+      "Drupal\\Tests\\file\\Functional\\DownloadTest",
+      "Drupal\\Tests\\system\\Functional\\Update\\SqlContentEntityStorageRevisionDataCleanupTest"
     ]'
 
 jobs:

diff --git a/tests/github/drupal_patch.sh b/tests/github/drupal_patch.sh
@@ -10,8 +10,5 @@ git apply -v ./drudbal_staging/tests/github/2992274-local.patch
 #3389397 WebDriverCurlService::execute() needs a @return annotation
 curl https://git.drupalcode.org/project/drupal/-/merge_requests/4865.diff | git apply -v
 
-#3397302 Notation of placeholders in SqlContentEntityStorageRevisionDataCleanupTest is incorrect
-curl https://git.drupalcode.org/project/drupal/-/merge_requests/5158.diff | git apply -v
-
 #3396559 Only set content-length header in specific situations
 curl https://git.drupalcode.org/project/drupal/-/merge_requests/5121.diff | git apply -v
diff --git a/tests/github/test.patch b/tests/github/test.patch
@@ -1,18 +1,12 @@
-diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
-index 5a5f92339b..7632861426 100644
---- a/core/includes/install.core.inc
-+++ b/core/includes/install.core.inc
-@@ -960,10 +960,13 @@ function install_get_form($form_id, array &$install_state) {
-     // For non-interactive installs, submit the form programmatically with the
-     // values taken from the installation state.
-     $install_form_id = $form_builder->getFormId($form_id, $form_state);
-+dump($install_form_id);
-     if (!empty($install_state['forms'][$install_form_id])) {
-+dump($install_state['forms'][$install_form_id]);
-       $form_state->setValues($install_state['forms'][$install_form_id]);
-     }
-     $form_builder->submitForm($form_id, $form_state);
-+dump($form_state->getErrors());
+diff --git a/core/tests/Drupal/Tests/UpdatePathTestTrait.php b/core/tests/Drupal/Tests/UpdatePathTestTrait.php
+index 0abf1cc477..992dc38ec9 100644
+--- a/core/tests/Drupal/Tests/UpdatePathTestTrait.php
++++ b/core/tests/Drupal/Tests/UpdatePathTestTrait.php
+@@ -44,6 +44,7 @@ protected function runUpdates($update_url = NULL) {
+     ]);
+
+     $this->drupalGet($update_url);
++dump($update_url, $this->getSession()->getPage());
+     $this->updateRequirementsProblem();
+     $this->clickLink('Continue');
 
-     // Throw an exception in case of any form validation error.
-     if ($errors = $form_state->getErrors()) {