Test on Drupal 9.3, stop testing on Drupal 8 (EOL) (#4962)

drush-ops · Dec 31, 2021 · 85eea99 · 85eea99
1 parent 1ea2dbb
commit 85eea99
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -66,9 +66,9 @@ workflows:
           matrix:
             parameters:
               os: [linux74, linux56]
-              drupal: ["9.1.3", "8.9.13", "7"]
+              drupal: ["9.3.0","9.1.15", "7"]
             exclude:
               - os: linux56
-                drupal: "9.1.3"
+                drupal: "9.3.0"
               - os: linux56
-                drupal: "8.9.13"
+                drupal: "9.1.15"
diff --git a/commands/pm/pm.drush.inc b/commands/pm/pm.drush.inc
@@ -1608,7 +1608,7 @@ function pm_parse_version($version, $is_core = FALSE) {
     $drupal_version_default = 8;
   }
   if ($core_parts['major'] == '') {
-    $core_parts['major'] = ($drupal_version_default) ? $drupal_version_default : drush_get_option('default-major', 8);
+    $core_parts['major'] = ($drupal_version_default) ? $drupal_version_default : drush_get_option('default-major', 7);
   }
 
   if ($is_core) {

diff --git a/tests/archiveDumpTest.php b/tests/archiveDumpTest.php
@@ -72,7 +72,8 @@ public function testArchiveDump() {
     $untar_dest = $this->unTar($dump_dest);
 
     if (strpos(UNISH_DB_URL, 'mysql') !== FALSE) {
-      $this->execute(sprintf('head %s/unish_%s.sql | grep "MySQL dump"', $untar_dest, self::uri));
+      $this->assertFileExists($untar_dest . '/unish_' . self::uri . '.sql');
+      $this->execute(sprintf('head %s/unish_%s.sql | grep " dump"', $untar_dest, self::uri));
     }
     $this->assertFileExists($untar_dest . '/MANIFEST.ini');
     $this->assertFileExists($untar_dest . '/' . $docroot);

diff --git a/tests/coreTest.php b/tests/coreTest.php
@@ -130,7 +130,7 @@ function testCoreRequirements() {
       'root' => $root,
       'uri' => key($this->getSites()),
       'pipe' => NULL,
-      'ignore' => 'cron,http requests,update,update_core,trusted_host_patterns', // no network access when running in tests, so ignore these
+      'ignore' => 'cron,http requests,update,update_core,trusted_host_patterns,coverage_core', // no network access when running in tests, so ignore these
       'strict' => 0, // invoke from script: do not verify options
     );
     // Drupal 6 has reached EOL, so we will always get errors for 'update_contrib';