diff -u b/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7TestBase.php b/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7TestBase.php --- b/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7TestBase.php +++ b/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7TestBase.php @@ -11,6 +11,7 @@ abstract class MigrateDrupal7TestBase extends MigrateDrupalTestBase { use NodeMigrateTypeTestTrait; + /** * {@inheritdoc} */ diff -u b/core/modules/migrate_drupal/tests/src/Traits/NodeMigrateTypeTestTrait.php b/core/modules/migrate_drupal/tests/src/Traits/NodeMigrateTypeTestTrait.php --- b/core/modules/migrate_drupal/tests/src/Traits/NodeMigrateTypeTestTrait.php +++ b/core/modules/migrate_drupal/tests/src/Traits/NodeMigrateTypeTestTrait.php @@ -8,6 +8,13 @@ trait NodeMigrateTypeTestTrait { /** + * The migrate_map table name. + * + * @var string + */ + public $tableName = NULL; + + /** * Gets the numbers of complete and classic node migrate_map tables. * * @param string $version @@ -57,12 +64,14 @@ * The migrate_map table name. */ protected function getTableName($type, $version) { - $content_type = $this->randomMachineName(); - $name = 'migrate_map_d' . $version . '_node_master__' . $content_type; - if ($type == 'classic') { - $name = 'migrate_map_d' . $version . '_node__' . $content_type; + if (!$this->tableName) { + $content_type = $this->randomMachineName(); + $this->tableName = 'migrate_map_d' . $version . '_node_master__' . $content_type; + if ($type == 'classic') { + $this->tableName = 'migrate_map_d' . $version . '_node__' . $content_type; + } } - return $name; + return $this->tableName; } /** diff -u b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeMasterTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeMasterTest.php --- b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeMasterTest.php +++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeMasterTest.php @@ -2,7 +2,6 @@ namespace Drupal\Tests\node\Kernel\Migrate\d6; -use Drupal\migrate\Audit\IdAuditor; use Drupal\node\NodeInterface; use Drupal\Tests\file\Kernel\Migrate\d6\FileMigrationTestTrait; use Drupal\Tests\migrate_drupal\Traits\CreateTestContentEntitiesTrait;