diff -Nru phpmyadmin-5.1.1+dfsg1/debian/changelog phpmyadmin-5.1.1+dfsg1/debian/changelog --- phpmyadmin-5.1.1+dfsg1/debian/changelog 2022-01-12 01:27:47.000000000 +0000 +++ phpmyadmin-5.1.1+dfsg1/debian/changelog 2022-01-20 15:22:49.000000000 +0000 @@ -1,3 +1,10 @@ +phpmyadmin (4:5.1.1+dfsg1-5ubuntu1) jammy; urgency=medium + + * Add patch to drop testImportOsm and + testDoImport tests. + + -- Utkarsh Gupta Thu, 20 Jan 2022 20:52:49 +0530 + phpmyadmin (4:5.1.1+dfsg1-5) unstable; urgency=medium * Add a patch to fix PHP 8.1 test failure (Closes: #1000571) diff -Nru phpmyadmin-5.1.1+dfsg1/debian/patches/drop-testimportosm-and-testdoimport-tests.patch phpmyadmin-5.1.1+dfsg1/debian/patches/drop-testimportosm-and-testdoimport-tests.patch --- phpmyadmin-5.1.1+dfsg1/debian/patches/drop-testimportosm-and-testdoimport-tests.patch 1970-01-01 00:00:00.000000000 +0000 +++ phpmyadmin-5.1.1+dfsg1/debian/patches/drop-testimportosm-and-testdoimport-tests.patch 2022-01-20 15:21:25.000000000 +0000 @@ -0,0 +1,107 @@ +Description: Drop these two tests. + Upstream has ACK'd these changes. And this patch + can be dropped in the next version as it'll be + fixed in Debian, by default. +Author: Utkarsh Gupta + +--- a/test/classes/Plugins/Import/ImportShpTest.php ++++ b/test/classes/Plugins/Import/ImportShpTest.php +@@ -113,98 +113,6 @@ class ImportShpTest extends AbstractTestCase + ); + } + +- /** +- * Test for doImport with complex data +- * +- * @group medium +- * @group 32bit-incompatible +- */ +- public function testImportOsm(): void +- { +- //$sql_query_disabled will show the import SQL detail +- //$import_notice will show the import detail result +- global $import_notice, $sql_query, $sql_query_disabled; +- $sql_query_disabled = false; +- +- //Test function called +- $this->runImport('test/test_data/dresden_osm.shp.zip'); +- +- $this->assertMessages($import_notice); +- +- $endsWith = "13.737122 51.0542065)))'))"; +- +- if (extension_loaded('dbase')) { +- $endsWith = "13.737122 51.0542065)))'),"; +- } +- +- $this->assertStringContainsString( +- "(GeomFromText('MULTIPOLYGON(((" +- . '13.737122 51.0542065,' +- . '13.7373039 51.0541298,' +- . '13.7372661 51.0540944,' +- . '13.7370842 51.0541711,' +- . $endsWith, +- $sql_query +- ); +- } +- +- /** +- * Test for doImport +- * +- * @group medium +- * @group 32bit-incompatible +- */ +- public function testDoImport(): void +- { +- //$sql_query_disabled will show the import SQL detail +- //$import_notice will show the import detail result +- global $import_notice, $sql_query, $sql_query_disabled; +- $sql_query_disabled = false; +- +- //Test function called +- $this->runImport('test/test_data/timezone.shp.zip'); +- +- // asset that all sql are executed +- $this->assertStringContainsString( +- 'CREATE DATABASE IF NOT EXISTS `SHP_DB` DEFAULT CHARACTER ' +- . 'SET utf8 COLLATE utf8_general_ci', +- $sql_query +- ); +- +- // dbase extension will generate different sql statement +- if (extension_loaded('dbase')) { +- $this->assertStringContainsString( +- 'CREATE TABLE IF NOT EXISTS `SHP_DB`.`TBL_NAME` ' +- . '(`SPATIAL` geometry, `ID` int(2), `AUTHORITY` varchar(25), `NAME` varchar(42)) ' +- . 'DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;', +- $sql_query +- ); +- +- $this->assertStringContainsString( +- 'INSERT INTO `SHP_DB`.`TBL_NAME` (`SPATIAL`, `ID`, `AUTHORITY`, `NAME`) VALUES', +- $sql_query +- ); +- } else { +- $this->assertStringContainsString( +- 'CREATE TABLE IF NOT EXISTS `SHP_DB`.`TBL_NAME` (`SPATIAL` geometry)', +- $sql_query +- ); +- +- $this->assertStringContainsString( +- 'INSERT INTO `SHP_DB`.`TBL_NAME` (`SPATIAL`) VALUES', +- $sql_query +- ); +- } +- +- $this->assertStringContainsString( +- "GeomFromText('POINT(1294523.1759236", +- $sql_query +- ); +- +- //asset that all databases and tables are imported +- $this->assertMessages($import_notice); +- } +- + /** + * Validates import messages + * diff -Nru phpmyadmin-5.1.1+dfsg1/debian/patches/series phpmyadmin-5.1.1+dfsg1/debian/patches/series --- phpmyadmin-5.1.1+dfsg1/debian/patches/series 2022-01-12 01:12:53.000000000 +0000 +++ phpmyadmin-5.1.1+dfsg1/debian/patches/series 2022-01-20 15:22:30.000000000 +0000 @@ -12,3 +12,4 @@ allow-symfony-v5-for-PHP-8-compat.patch php-8.1-test-suite-fix.patch php-8.1-deprecation-fixes.patch +drop-testimportosm-and-testdoimport-tests.patch