Verified Commit 8a21edc8 authored by Dave Long's avatar Dave Long
Browse files

test: #3577377 Pipeline performance followups

By: catch
parent 7904ce30
Loading
Loading
Loading
Loading
Loading
+12 −12
Original line number Diff line number Diff line
@@ -408,6 +408,16 @@ default:
# Test Jobs
################

'👷️️️ PHPUnit Build':
  <<: [ *with-composer, *test-setup ]
  retry: 1
  variables:
    TESTSUITE: PHPUnit-Build
    KUBERNETES_CPU_REQUEST: "12"
    CONCURRENCY: "6"
  services:
    - <<: *with-database

'🖱️️️ PHPUnit Functional Javascript':
  <<: [ *with-composer, *test-setup ]
  parallel: 3
@@ -422,16 +432,6 @@ default:
    - sed -i "s#$CI_PROJECT_DIR/##" ./sites/default/files/simpletest/phpunit-*.xml || true
    - cp /builds/chromedriver.log ./

'👷️️️ PHPUnit Build':
  <<: [ *with-composer, *test-setup ]
  retry: 1
  variables:
    TESTSUITE: PHPUnit-Build
    KUBERNETES_CPU_REQUEST: "8"
    CONCURRENCY: "5"
  services:
    - <<: *with-database

'🌐️️ PHPUnit Functional':
  <<: [ *with-composer, *test-setup ]
  parallel: 8
@@ -447,8 +447,8 @@ default:
  parallel: 4
  variables:
    TESTSUITE: PHPUnit-Kernel
    KUBERNETES_CPU_REQUEST: "8"
    CONCURRENCY: "24"
    KUBERNETES_CPU_REQUEST: "12"
    CONCURRENCY: "20"
  services:
    - <<: *with-database

+16 −31
Original line number Diff line number Diff line
@@ -26,22 +26,26 @@ class BigPipeRegressionTest extends WebDriverTestBase {
    'big_pipe',
    'big_pipe_messages_test',
    'big_pipe_regression_test',
    'render_placeholder_message_test',
  ];

  /**
   * {@inheritdoc}
   */
  protected $defaultTheme = 'stark';
  protected $defaultTheme = 'big_pipe_test_theme';

  /**
   * {@inheritdoc}
   * Tests edge cases with placeholder HTML.
   */
  protected function setUp(): void {
    parent::setUp();

    // Use the big_pipe_test_theme theme.
    $this->container->get('theme_installer')->install(['big_pipe_test_theme']);
    $this->container->get('config.factory')->getEditable('system.theme')->set('default', 'big_pipe_test_theme')->save();
  public function testPlaceholderHtmlEdgeCases(): void {
    $this->drupalLogin($this->drupalCreateUser());
    $this->doTestMultipleClosingBodies_2678662();
    $this->doTestMessages_2712935();
    $this->doTestPlaceholderInParagraph_2802923();
    $this->doTestBigPipeLargeContent();
    $this->doTestMultipleReplacements();
    $this->doInlineScriptTest();
    $this->doTestMultipleOccurrences();
  }

  /**
@@ -49,10 +53,7 @@ protected function setUp(): void {
   *
   * @see https://www.drupal.org/node/2678662
   */
  public function testMultipleClosingBodies_2678662(): void {
    $this->assertTrue($this->container->get('module_installer')->install(['render_placeholder_message_test'], TRUE), 'Installed modules.');

    $this->drupalLogin($this->drupalCreateUser());
  protected function doTestMultipleClosingBodies_2678662(): void {
    $this->drupalGet(Url::fromRoute('big_pipe_regression_test.2678662'));

    // Confirm that the JS variable has the appropriate content.
@@ -84,10 +85,7 @@ public function testMultipleClosingBodies_2678662(): void {
   *
   * @see https://www.drupal.org/node/2712935
   */
  public function testMessages_2712935(): void {
    $this->assertTrue($this->container->get('module_installer')->install(['render_placeholder_message_test'], TRUE), 'Installed modules.');

    $this->drupalLogin($this->drupalCreateUser());
  protected function doTestMessages_2712935(): void {
    $messages_markup = '<div class="messages messages--status" role="status"';
    $test_routes = [
      // Messages placeholder rendered first.
@@ -119,17 +117,6 @@ public function testMessages_2712935(): void {
    }
  }

  /**
   * Tests edge cases with placeholder HTML.
   */
  public function testPlaceholderHtmlEdgeCases(): void {
    $this->drupalLogin($this->drupalCreateUser());
    $this->doTestPlaceholderInParagraph_2802923();
    $this->doTestBigPipeLargeContent();
    $this->doTestMultipleReplacements();
    $this->doInlineScriptTest();
  }

  /**
   * Ensure default BigPipe placeholder HTML cannot split paragraphs.
   *
@@ -147,7 +134,7 @@ protected function doTestPlaceholderInParagraph_2802923(): void {
   * Repeat loading of same page for two times, after second time the page is
   * cached and the bug consistently reproducible.
   */
  public function doTestBigPipeLargeContent(): void {
  protected function doTestBigPipeLargeContent(): void {
    $assert_session = $this->assertSession();

    $this->drupalGet(Url::fromRoute('big_pipe_test_large_content'));
@@ -212,10 +199,8 @@ protected function doInlineScriptTest(): void {
  /**
   * Tests that all occurrences of the same placeholder are replaced.
   */
  public function testMultipleOccurrences(): void {
  protected function doTestMultipleOccurrences(): void {
    \Drupal::service('module_installer')->install(['big_pipe_test']);
    $user = $this->drupalCreateUser();
    $this->drupalLogin($user);
    $assert_session = $this->assertSession();
    $this->drupalGet(Url::fromRoute('big_pipe_test_multi_occurrence'));
    $this->assertNotNull($assert_session->waitForElement('css', 'script[data-big-pipe-event="stop"]'));
+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@
 * For testing the drupalEntityLinkSuggestions plugin.
 */
#[Group('ckeditor5')]
#[Group('#slow')]
#[RunTestsInSeparateProcesses]
class EntityLinkSuggestionsTest extends CKEditor5TestBase {

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@
 * Test enabling content translation module.
 */
#[Group('content_translation')]
#[Group('#slow')]
#[CoversClass(ContentLanguageSettingsForm::class)]
#[CoversClass(ContentTranslationFormLanguageHooks::class)]
#[RunTestsInSeparateProcesses]
+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@
 * Tests the Boolean field formatter settings.
 */
#[Group('field')]
#[Group('#slow')]
#[RunTestsInSeparateProcesses]
class BooleanFormatterSettingsTest extends WebDriverTestBase {

Loading