diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2018-12-03 09:42:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-03 09:42:18 +0300 |
| commit | ed877857e59ec5434153e7142b75f67208ef428e (patch) | |
| tree | 8f5cd55a4434b9a07642ff56762c715fa68cd62c /plugins/Diagnostics | |
| parent | 8ccbd91c8e177357d04309410d5bd689f7208132 (diff) | |
Fix build and make join table sort stable by using DFS (#13634)
* Try to fix php 7 tests.
* Make join table sort stable.
* Fix a test and try to debug php 7 build.
* Try to fix two other tests.
* Another build fix attempt.
* try another attempt at a stable sort
* debug travis build.
* debug travis build.
* debug travis build.
* debug travis build.
* anything?
* See if using a DFS fixes the test.
* Fix some tests and restore old travis.yml.
* Handle string tables with implicit dependencies in join DFS.
* Fix more tests.
* Fix test that fails on mysqli.
* Use is_numeric instead of regex.
* Better original format Site fix.
* Remove TODO and add Note.
* Cannot use is_numeric.
* Clean table sorting code.
* remove unneeded file
* Fix test and only convert site properties based on property list.
* Fixing some more tests.
Diffstat (limited to 'plugins/Diagnostics')
| -rw-r--r-- | plugins/Diagnostics/tests/Integration/Commands/AnalyzeArchiveTableTest.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/Diagnostics/tests/Integration/Commands/AnalyzeArchiveTableTest.php b/plugins/Diagnostics/tests/Integration/Commands/AnalyzeArchiveTableTest.php index 4db4dc107b..00935034fb 100644 --- a/plugins/Diagnostics/tests/Integration/Commands/AnalyzeArchiveTableTest.php +++ b/plugins/Diagnostics/tests/Integration/Commands/AnalyzeArchiveTableTest.php @@ -41,12 +41,12 @@ Statistics for the archive_numeric_2010_03 and archive_blob_2010_03 tables: +-------------------------------------------+------------+---------------+-------------+---------+-----------+----------------+-------------+-------------+ | Group | # Archives | # Invalidated | # Temporary | # Error | # Segment | # Numeric Rows | # Blob Rows | # Blob Data | +-------------------------------------------+------------+---------------+-------------+---------+-----------+----------------+-------------+-------------+ -| week[2010-03-01 - 2010-03-07] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 60 | 97 | 8363 | -| month[2010-03-01 - 2010-03-31] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 60 | 97 | 8363 | +| week[2010-03-01 - 2010-03-07] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 60 | 96 | %d | +| month[2010-03-01 - 2010-03-31] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 60 | 96 | %d | | day[2010-03-03 - 2010-03-03] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 0 | 0 | | | day[2010-03-04 - 2010-03-04] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 0 | 0 | | | day[2010-03-05 - 2010-03-05] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 0 | 0 | | -| day[2010-03-06 - 2010-03-06] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 60 | 73 | 7962 | +| day[2010-03-06 - 2010-03-06] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 60 | 72 | %d | | day[2010-03-07 - 2010-03-07] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 0 | 0 | | | day[2010-03-08 - 2010-03-08] idSite = 1 | 5 | 0 | 0 | 0 | 4 | 0 | 0 | | | week[2010-03-08 - 2010-03-14] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 0 | 0 | | @@ -93,7 +93,7 @@ OUTPUT; )); $actual = $this->applicationTester->getDisplay(); - $this->assertEquals($expected, $actual); + $this->assertStringMatchesFormat($expected, $actual); } } |