Comments

quietone created an issue. See original summary.

quietone’s picture

Issue summary: View changes
Status: Active » Needs review
StatusFileSize
new7.01 KB

Status: Needs review » Needs work

The last submitted patch, 2: 3143720-2.patch, failed testing. View results

quietone’s picture

Status: Needs work » Needs review
StatusFileSize
new2.31 KB
new8.43 KB

This moves the declaration of $destinationSiteVersion to MigrateUpgradeTestBase::setUp().

quietone’s picture

StatusFileSize
new3.56 KB
new7.57 KB

Reroll since #3143719: Add a getCredentials helper method to migrate_drupal_ui functional tests was committed.

This confirms that benjifisher was correct in 3143719#5 to return an array.

Status: Needs review » Needs work

The last submitted patch, 5: 3143720-5.patch, failed testing. View results

quietone’s picture

Status: Needs work » Needs review
StatusFileSize
new808 bytes
new7.97 KB

Restore the line to get the legacy Drupal version.

quietone’s picture

StatusFileSize
new1.87 KB
new8.69 KB

Patch no longer applied, so I rerolled it.

Status: Needs review » Needs work

The last submitted patch, 8: 3143720-8.patch, failed testing. View results

quietone’s picture

Status: Needs work » Needs review
Issue tags: +Migrate UI
StatusFileSize
new1.05 KB
new8.72 KB

I missed that the strings for the field paths had changed.

quietone’s picture

StatusFileSize
new1.92 KB
new7.98 KB
quietone’s picture

Status: Needs review » Needs work
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php
@@ -109,6 +82,7 @@ public function testMigrateUpgradeExecute() {
+    $version = $this->getLegacyDrupalVersion($this->sourceDatabase);

I think this can be removed and assertUpgrade can get the version number

quietone’s picture

Status: Needs work » Needs review
StatusFileSize
new2.7 KB
new9.49 KB

Fixes for #13.

quietone’s picture

StatusFileSize
new619 bytes
new9.5 KB

s/public/protected for $modules.

mikelutz’s picture

Status: Needs review » Needs work
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/CredentialFormTest.php
@@ -0,0 +1,121 @@
+  /**
+   * {@inheritdoc}
+   */
+  protected function getAvailablePaths() {
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEntityCounts() {
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEntityCountsIncremental() {
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getMissingPaths() {
+  }

I think we need to return the correct types here, empty arrays for most of them, I think.

quietone’s picture

Issue tags: +Novice

This is suitable for a novice. A similar fix was done at https://www.drupal.org/project/drupal/issues/3143721#comment-13811695

ayushmishra206’s picture

Assigned: Unassigned » ayushmishra206
ayushmishra206’s picture

Assigned: ayushmishra206 » Unassigned
Status: Needs work » Needs review
StatusFileSize
new825 bytes
new9.5 KB

Made the changes suggested in #15. Thankyou for the help @quietone!

mikelutz’s picture

Status: Needs review » Reviewed & tested by the community

RTBC pending tests.

Status: Reviewed & tested by the community » Needs work

The last submitted patch, 18: 3143720-18.patch, failed testing. View results

ayushmishra206’s picture

Assigned: Unassigned » ayushmishra206
ayushmishra206’s picture

StatusFileSize
new9.54 KB
ayushmishra206’s picture

Status: Needs work » Needs review
StatusFileSize
new9.54 KB
spokje’s picture

Assigned: ayushmishra206 » Unassigned
Status: Needs review » Needs work

Reran test on #18, previous failure seemed to be random.

spokje’s picture

Status: Needs work » Reviewed & tested by the community

@ayushmishra206 Sorry, had an old window open, resetting status to RTBC on #18 as per #19 by Mike Lutz

quietone’s picture

Status: Reviewed & tested by the community » Needs work

@ayushmishra206, thanks for the patches! Please remember to upload an interdiff.

@Spokje, since there was a new patch, in #23, I don't see why the tests were rerun on the patch in #18. And, of course, not rerunning tests will save on resources.

I downloaded the patch in #14 and #18. An interdiff on those shows they are identical, that is, it does not contain the changes requested in #15.

The patches in #22 and #23 are also identical.

I reviewed the patch in #23 and found that is contains 3 of the 4 changes requested in #15. Just one more to fix!

+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/CredentialFormTest.php
@@ -0,0 +1,124 @@
+  protected function getMissingPaths() {
+  }

This should be returning an empty array as per #15.

ayushmishra206’s picture

Assigned: Unassigned » ayushmishra206
spokje’s picture

@Spokje, since there was a new patch, in #23, I don't see why the tests were rerun on the patch in #18. And, of course, not rerunning tests will save on resources.

@quietone, I started the rerun of the test on #18 when your comment #19 was the latest entry and the first testbot run on it seemed to be a random failure.
When the test was finished (this time successful, so it was a false positive) I didn't reload my open browser-tab and didn't notice the (identical, so not so) new patches. Hence my comment #25 which is now completely out of sync.

Besides the above: You're completely right (as usual :)

ayushmishra206’s picture

Status: Needs work » Needs review
StatusFileSize
new527 bytes
new9.55 KB

I am sorry for creating this much of confusion. I have made the changes suggested in #26. Please review

ayushmishra206’s picture

Assigned: ayushmishra206 » Unassigned
quietone’s picture

Status: Needs review » Needs work

@ayushmishra206, thanks. Now, all the return statements are there and tests are passing. Unfortunately, there are coding standard errors, see https://www.drupal.org/pift-ci-job/1821801.

@Spokje, ah, I see. That makes sense.

sarvjeetsingh’s picture

Status: Needs work » Needs review
StatusFileSize
new809 bytes
new9.56 KB

fixed the coding standards error.

mikelutz’s picture

Status: Needs review » Reviewed & tested by the community

Okay, looks right now.

Status: Reviewed & tested by the community » Needs work

The last submitted patch, 32: 3143720-32.patch, failed testing. View results

quietone’s picture

Sigh, random failure from Drupal\Tests\quickedit\FunctionalJavascript\QuickEditIntegrationTest. Retesting

mikelutz’s picture

Status: Needs work » Reviewed & tested by the community
quietone’s picture

Status: Reviewed & tested by the community » Needs work
Issue tags: +Needs reroll
spokje’s picture

Status: Needs work » Needs review
StatusFileSize
new9.19 KB

Reroll of patch #32

quietone’s picture

@Spokje, please provide a diff. It helps the reviewer. There are instructions for creating an interdiff.

spokje’s picture

Issue tags: -Needs reroll
StatusFileSize
new2.73 KB

@quietone Sorry, had actually created an interdiff, but forgot to upload it. Here it is now.

spokje’s picture

I think since it's a reroll this can be RTBC per #33, but I've been bitten before after rerolling and RTBC-ing it myself, so I'll leave this on NR for now.

quietone’s picture

@Spokje, thanks for the interdiff. I was just about to upload my reroll of the patch when I refreshed the page and saw that you had already done it. That was fast of you! And, yes, it is best to let someone else review a reroll and set it back to RTBC. I have seen exceptions to that but they are very rare and only for minor changes.

The patch looks good to me, but I can't RTBC it.

benjifisher’s picture

As far as git is concerned, this is a very routine reroll: a few lines of context were removed from MigrateUpgradeExecuteTestBase.php in #3143721: Create a separate SourceProviderTest, and that is the only difference between the patches in #32 and #38.

I still want to look a little closer to make sure that the patch makes sense in that context.

benjifisher’s picture

Status: Needs review » Needs work

I am glad I decided to take a closer look. There is nothing wrong with the reroll, but this hunk is redundant:

+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
@@ -43,6 +43,10 @@ abstract class MigrateUpgradeTestBase extends BrowserTestBase {
    */
   protected function setUp() {
     parent::setUp();
+
+    // Get the current major version.
+    [$this->destinationSiteVersion] = explode('.', \Drupal::VERSION, 2);
+
     $this->createMigrationConnection();
     $this->sourceDatabase = Database::getConnection('default', 'migrate_drupal_ui');

Thanks for cleaning up the tests. They have to be maintainable, too!

quietone’s picture

Status: Needs work » Needs review
Issue tags: -Novice
StatusFileSize
new769 bytes
new769 bytes

Goodness, how did I miss that before. Thanks benjifisher!

quietone’s picture

StatusFileSize
new8.81 KB

Uploading the patch helps. (In my defense, I had to run to the kitchen).

benjifisher’s picture

Status: Needs review » Reviewed & tested by the community

Mmm, what's cooking?

Thanks for the updated patch. Back to RTBC.

  • catch committed 1e03b1c on 9.1.x
    Issue #3143720 by quietone, ayushmishra206, Spokje, sarvjeetsingh,...
catch’s picture

Status: Reviewed & tested by the community » Fixed

Committed 1e03b1c and pushed to 9.1.x. Thanks!

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.