diff options
| author | dizzy <diosmosis@users.noreply.github.com> | 2021-04-12 07:30:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-12 07:30:17 +0300 |
| commit | 0e6a6ea103d4e0aa50e4912f345fb2d1da9dd58c (patch) | |
| tree | 081f1b246c880991aace4cedd4e7a91bcd0ff4ac /tests/PHPUnit/Framework | |
| parent | 5573d22a459d65749ebdfc257ac773979ae12ea4 (diff) | |
Fixes for specific case when partial archives have to initiate archiving for child archives (#17439)
* Add new test for partial archiving edge case, add two safety/sanity checks for partial archives, fix a couple issues that arise when archiving a multi-period partial archive that has to initiate archiving for a child archive and reuse archives for a child archive.
* remove unneeded test and make existing test more trustworthy
* apply review feedback
Diffstat (limited to 'tests/PHPUnit/Framework')
| -rw-r--r-- | tests/PHPUnit/Framework/TestCase/IntegrationTestCase.php | 2 | ||||
| -rw-r--r-- | tests/PHPUnit/Framework/TestCase/SystemTestCase.php | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/PHPUnit/Framework/TestCase/IntegrationTestCase.php b/tests/PHPUnit/Framework/TestCase/IntegrationTestCase.php index ae26a06e27..c44995e904 100644 --- a/tests/PHPUnit/Framework/TestCase/IntegrationTestCase.php +++ b/tests/PHPUnit/Framework/TestCase/IntegrationTestCase.php @@ -85,7 +85,7 @@ abstract class IntegrationTestCase extends SystemTestCase Fixture::loadAllPlugins(new TestingEnvironmentVariables(), get_class($this), self::$fixture->extraPluginsToLoad); Access::getInstance()->setSuperUserAccess(true); - + if (!empty(self::$tableData)) { self::restoreDbTables(self::$tableData); } diff --git a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php index 85a2e85326..58ed04fa35 100644 --- a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php +++ b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php @@ -783,7 +783,6 @@ abstract class SystemTestCase extends TestCase } - } } |