revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-24 22:40:55 +01:00
Code Issues Releases Wiki Activity

Remove leftover code for "postponed" lint and unit status

Browse source 
Summary: Ref T9134. It looks like this functionality was removed in D13848.

Test Plan: Submitted a diff successfully.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: Korvin

Maniphest Tasks: T9134

Differential Revision: https://secure.phabricator.com/D13869
This commit is contained in:
Joshua Spence 2015-08-29 18:51:26 +10:00
parent fd189f14fb
commit ff6ccd5f68
8 changed files with 17 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/applications/differential/conduit/DifferentialCreateDiffConduitAPIMethod.php
View file

@ -26,7 +26,6 @@ final class DifferentialCreateDiffConduitAPIMethod
'okay', 'okay',
'warn', 'warn',
'fail', 'fail',
'postponed',
)); ));
return array( return array(
@ -95,9 +94,6 @@ final class DifferentialCreateDiffConduitAPIMethod
case 'fail': case 'fail':
$lint_status = DifferentialLintStatus::LINT_FAIL; $lint_status = DifferentialLintStatus::LINT_FAIL;
break; break;
case 'postponed':
$lint_status = DifferentialLintStatus::LINT_POSTPONED;
break;
case 'none': case 'none':
default: default:
$lint_status = DifferentialLintStatus::LINT_NONE; $lint_status = DifferentialLintStatus::LINT_NONE;
@ -117,9 +113,6 @@ final class DifferentialCreateDiffConduitAPIMethod
case 'fail': case 'fail':
$unit_status = DifferentialUnitStatus::UNIT_FAIL; $unit_status = DifferentialUnitStatus::UNIT_FAIL;
break; break;
case 'postponed':
$unit_status = DifferentialUnitStatus::UNIT_POSTPONED;
break;
case 'none': case 'none':
default: default:
$unit_status = DifferentialUnitStatus::UNIT_NONE; $unit_status = DifferentialUnitStatus::UNIT_NONE;

13
src/applications/differential/constants/DifferentialLintStatus.php
View file

@ -2,12 +2,11 @@
final class DifferentialLintStatus extends Phobject { final class DifferentialLintStatus extends Phobject {
const LINT_NONE = 0; const LINT_NONE = 0;
const LINT_OKAY = 1; const LINT_OKAY = 1;
const LINT_WARN = 2; const LINT_WARN = 2;
const LINT_FAIL = 3; const LINT_FAIL = 3;
const LINT_SKIP = 4; const LINT_SKIP = 4;
const LINT_POSTPONED = 5; const LINT_AUTO_SKIP = 6;
const LINT_AUTO_SKIP = 6;
} }

13
src/applications/differential/constants/DifferentialUnitStatus.php
View file

@ -2,12 +2,11 @@
final class DifferentialUnitStatus extends Phobject { final class DifferentialUnitStatus extends Phobject {
const UNIT_NONE = 0; const UNIT_NONE = 0;
const UNIT_OKAY = 1; const UNIT_OKAY = 1;
const UNIT_WARN = 2; const UNIT_WARN = 2;
const UNIT_FAIL = 3; const UNIT_FAIL = 3;
const UNIT_SKIP = 4; const UNIT_SKIP = 4;
const UNIT_POSTPONED = 5; const UNIT_AUTO_SKIP = 6;
const UNIT_AUTO_SKIP = 6;
} }

11
src/applications/differential/constants/DifferentialUnitTestResult.php
View file

@ -2,11 +2,10 @@
final class DifferentialUnitTestResult extends Phobject { final class DifferentialUnitTestResult extends Phobject {
const RESULT_PASS = 'pass'; const RESULT_PASS = 'pass';
const RESULT_FAIL = 'fail'; const RESULT_FAIL = 'fail';
const RESULT_SKIP = 'skip'; const RESULT_SKIP = 'skip';
const RESULT_BROKEN = 'broken'; const RESULT_BROKEN = 'broken';
const RESULT_UNSOUND = 'unsound'; const RESULT_UNSOUND = 'unsound';
const RESULT_POSTPONED = 'postponed';
} }

4
src/applications/differential/customfield/DifferentialLintField.php
View file

@ -73,9 +73,6 @@ final class DifferentialLintField
if ($status == DifferentialLintStatus::LINT_SKIP) { if ($status == DifferentialLintStatus::LINT_SKIP) {
$warnings[] = pht( $warnings[] = pht(
'Lint was skipped when generating these changes.'); 'Lint was skipped when generating these changes.');
} else if ($status == DifferentialLintStatus::LINT_POSTPONED) {
$warnings[] = pht(
'Background linting has not finished executing on these changes.');
} else { } else {
$warnings[] = pht('These changes have lint problems.'); $warnings[] = pht('These changes have lint problems.');
} }
@ -94,7 +91,6 @@ final class DifferentialLintField
DifferentialLintStatus::LINT_FAIL => 'red', DifferentialLintStatus::LINT_FAIL => 'red',
DifferentialLintStatus::LINT_SKIP => 'blue', DifferentialLintStatus::LINT_SKIP => 'blue',
DifferentialLintStatus::LINT_AUTO_SKIP => 'blue', DifferentialLintStatus::LINT_AUTO_SKIP => 'blue',
DifferentialLintStatus::LINT_POSTPONED => 'blue',
); );
$icon_color = idx($colors, $diff->getLintStatus(), 'grey'); $icon_color = idx($colors, $diff->getLintStatus(), 'grey');

4
src/applications/differential/customfield/DifferentialUnitField.php
View file

@ -84,9 +84,6 @@ final class DifferentialUnitField
// Don't show any warnings. // Don't show any warnings.
} else if ($status == DifferentialUnitStatus::UNIT_AUTO_SKIP) { } else if ($status == DifferentialUnitStatus::UNIT_AUTO_SKIP) {
// Don't show any warnings. // Don't show any warnings.
} else if ($status == DifferentialUnitStatus::UNIT_POSTPONED) {
$warnings[] = pht(
'Background tests have not finished executing on these changes.');
} else if ($status == DifferentialUnitStatus::UNIT_SKIP) { } else if ($status == DifferentialUnitStatus::UNIT_SKIP) {
$warnings[] = pht( $warnings[] = pht(
'Unit tests were skipped when generating these changes.'); 'Unit tests were skipped when generating these changes.');
@ -108,7 +105,6 @@ final class DifferentialUnitField
DifferentialUnitStatus::UNIT_FAIL => 'red', DifferentialUnitStatus::UNIT_FAIL => 'red',
DifferentialUnitStatus::UNIT_SKIP => 'blue', DifferentialUnitStatus::UNIT_SKIP => 'blue',
DifferentialUnitStatus::UNIT_AUTO_SKIP => 'blue', DifferentialUnitStatus::UNIT_AUTO_SKIP => 'blue',
DifferentialUnitStatus::UNIT_POSTPONED => 'blue',
); );
$icon_color = idx($colors, $diff->getUnitStatus(), 'grey'); $icon_color = idx($colors, $diff->getUnitStatus(), 'grey');

6
src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
View file

@ -323,7 +323,6 @@ final class DifferentialRevisionUpdateHistoryView extends AphrontView {
DifferentialLintStatus::LINT_FAIL => self::STAR_FAIL, DifferentialLintStatus::LINT_FAIL => self::STAR_FAIL,
DifferentialLintStatus::LINT_SKIP => self::STAR_SKIP, DifferentialLintStatus::LINT_SKIP => self::STAR_SKIP,
DifferentialLintStatus::LINT_AUTO_SKIP => self::STAR_SKIP, DifferentialLintStatus::LINT_AUTO_SKIP => self::STAR_SKIP,
DifferentialLintStatus::LINT_POSTPONED => self::STAR_SKIP,
); );
$star = idx($map, $diff->getLintStatus(), self::STAR_FAIL); $star = idx($map, $diff->getLintStatus(), self::STAR_FAIL);
@ -339,7 +338,6 @@ final class DifferentialRevisionUpdateHistoryView extends AphrontView {
DifferentialUnitStatus::UNIT_FAIL => self::STAR_FAIL, DifferentialUnitStatus::UNIT_FAIL => self::STAR_FAIL,
DifferentialUnitStatus::UNIT_SKIP => self::STAR_SKIP, DifferentialUnitStatus::UNIT_SKIP => self::STAR_SKIP,
DifferentialUnitStatus::UNIT_AUTO_SKIP => self::STAR_SKIP, DifferentialUnitStatus::UNIT_AUTO_SKIP => self::STAR_SKIP,
DifferentialUnitStatus::UNIT_POSTPONED => self::STAR_SKIP,
); );
$star = idx($map, $diff->getUnitStatus(), self::STAR_FAIL); $star = idx($map, $diff->getUnitStatus(), self::STAR_FAIL);
@ -361,8 +359,6 @@ final class DifferentialRevisionUpdateHistoryView extends AphrontView {
return pht('Lint Skipped'); return pht('Lint Skipped');
case DifferentialLintStatus::LINT_AUTO_SKIP: case DifferentialLintStatus::LINT_AUTO_SKIP:
return pht('Automatic diff as part of commit; lint not applicable.'); return pht('Automatic diff as part of commit; lint not applicable.');
case DifferentialLintStatus::LINT_POSTPONED:
return pht('Lint Postponed');
} }
return pht('Unknown'); return pht('Unknown');
} }
@ -382,8 +378,6 @@ final class DifferentialRevisionUpdateHistoryView extends AphrontView {
case DifferentialUnitStatus::UNIT_AUTO_SKIP: case DifferentialUnitStatus::UNIT_AUTO_SKIP:
return pht( return pht(
'Automatic diff as part of commit; unit tests not applicable.'); 'Automatic diff as part of commit; unit tests not applicable.');
case DifferentialUnitStatus::UNIT_POSTPONED:
return pht('Unit Tests Postponed');
} }
return pht('Unknown'); return pht('Unknown');
} }

1
src/applications/harbormaster/view/HarbormasterUnitPropertyView.php
View file

@ -88,7 +88,6 @@ final class HarbormasterUnitPropertyView extends AphrontView {
ArcanistUnitTestResult::RESULT_FAIL => pht('Failed'), ArcanistUnitTestResult::RESULT_FAIL => pht('Failed'),
ArcanistUnitTestResult::RESULT_UNSOUND => pht('Unsound'), ArcanistUnitTestResult::RESULT_UNSOUND => pht('Unsound'),
ArcanistUnitTestResult::RESULT_SKIP => pht('Skipped'), ArcanistUnitTestResult::RESULT_SKIP => pht('Skipped'),
ArcanistUnitTestResult::RESULT_POSTPONED => pht('Postponed'),
ArcanistUnitTestResult::RESULT_PASS => pht('Passed'), ArcanistUnitTestResult::RESULT_PASS => pht('Passed'),
); );
$result = idx($names, $result, $result); $result = idx($names, $result, $result);