Page MenuHomePhabricator
Files F14362286

D13869.diff
No OneTemporary
Actions

D13869.diff
View Options

diff --git a/src/applications/differential/conduit/DifferentialCreateDiffConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialCreateDiffConduitAPIMethod.php
--- a/src/applications/differential/conduit/DifferentialCreateDiffConduitAPIMethod.php
+++ b/src/applications/differential/conduit/DifferentialCreateDiffConduitAPIMethod.php
@@ -26,7 +26,6 @@
'okay',
'warn',
'fail',
- 'postponed',
));
return array(
@@ -95,9 +94,6 @@
case 'fail':
$lint_status = DifferentialLintStatus::LINT_FAIL;
break;
- case 'postponed':
- $lint_status = DifferentialLintStatus::LINT_POSTPONED;
- break;
case 'none':
default:
$lint_status = DifferentialLintStatus::LINT_NONE;
@@ -117,9 +113,6 @@
case 'fail':
$unit_status = DifferentialUnitStatus::UNIT_FAIL;
break;
- case 'postponed':
- $unit_status = DifferentialUnitStatus::UNIT_POSTPONED;
- break;
case 'none':
default:
$unit_status = DifferentialUnitStatus::UNIT_NONE;
diff --git a/src/applications/differential/constants/DifferentialLintStatus.php b/src/applications/differential/constants/DifferentialLintStatus.php
--- a/src/applications/differential/constants/DifferentialLintStatus.php
+++ b/src/applications/differential/constants/DifferentialLintStatus.php
@@ -2,12 +2,11 @@
final class DifferentialLintStatus extends Phobject {
- const LINT_NONE = 0;
- const LINT_OKAY = 1;
- const LINT_WARN = 2;
- const LINT_FAIL = 3;
- const LINT_SKIP = 4;
- const LINT_POSTPONED = 5;
- const LINT_AUTO_SKIP = 6;
+ const LINT_NONE = 0;
+ const LINT_OKAY = 1;
+ const LINT_WARN = 2;
+ const LINT_FAIL = 3;
+ const LINT_SKIP = 4;
+ const LINT_AUTO_SKIP = 6;
}
diff --git a/src/applications/differential/constants/DifferentialUnitStatus.php b/src/applications/differential/constants/DifferentialUnitStatus.php
--- a/src/applications/differential/constants/DifferentialUnitStatus.php
+++ b/src/applications/differential/constants/DifferentialUnitStatus.php
@@ -2,12 +2,11 @@
final class DifferentialUnitStatus extends Phobject {
- const UNIT_NONE = 0;
- const UNIT_OKAY = 1;
- const UNIT_WARN = 2;
- const UNIT_FAIL = 3;
- const UNIT_SKIP = 4;
- const UNIT_POSTPONED = 5;
- const UNIT_AUTO_SKIP = 6;
+ const UNIT_NONE = 0;
+ const UNIT_OKAY = 1;
+ const UNIT_WARN = 2;
+ const UNIT_FAIL = 3;
+ const UNIT_SKIP = 4;
+ const UNIT_AUTO_SKIP = 6;
}
diff --git a/src/applications/differential/constants/DifferentialUnitTestResult.php b/src/applications/differential/constants/DifferentialUnitTestResult.php
--- a/src/applications/differential/constants/DifferentialUnitTestResult.php
+++ b/src/applications/differential/constants/DifferentialUnitTestResult.php
@@ -2,11 +2,10 @@
final class DifferentialUnitTestResult extends Phobject {
- const RESULT_PASS = 'pass';
- const RESULT_FAIL = 'fail';
- const RESULT_SKIP = 'skip';
- const RESULT_BROKEN = 'broken';
- const RESULT_UNSOUND = 'unsound';
- const RESULT_POSTPONED = 'postponed';
+ const RESULT_PASS = 'pass';
+ const RESULT_FAIL = 'fail';
+ const RESULT_SKIP = 'skip';
+ const RESULT_BROKEN = 'broken';
+ const RESULT_UNSOUND = 'unsound';
}
diff --git a/src/applications/differential/customfield/DifferentialLintField.php b/src/applications/differential/customfield/DifferentialLintField.php
--- a/src/applications/differential/customfield/DifferentialLintField.php
+++ b/src/applications/differential/customfield/DifferentialLintField.php
@@ -73,9 +73,6 @@
if ($status == DifferentialLintStatus::LINT_SKIP) {
$warnings[] = pht(
'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 {
$warnings[] = pht('These changes have lint problems.');
}
@@ -94,7 +91,6 @@
DifferentialLintStatus::LINT_FAIL => 'red',
DifferentialLintStatus::LINT_SKIP => 'blue',
DifferentialLintStatus::LINT_AUTO_SKIP => 'blue',
- DifferentialLintStatus::LINT_POSTPONED => 'blue',
);
$icon_color = idx($colors, $diff->getLintStatus(), 'grey');
diff --git a/src/applications/differential/customfield/DifferentialUnitField.php b/src/applications/differential/customfield/DifferentialUnitField.php
--- a/src/applications/differential/customfield/DifferentialUnitField.php
+++ b/src/applications/differential/customfield/DifferentialUnitField.php
@@ -84,9 +84,6 @@
// Don't show any warnings.
} else if ($status == DifferentialUnitStatus::UNIT_AUTO_SKIP) {
// 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) {
$warnings[] = pht(
'Unit tests were skipped when generating these changes.');
@@ -108,7 +105,6 @@
DifferentialUnitStatus::UNIT_FAIL => 'red',
DifferentialUnitStatus::UNIT_SKIP => 'blue',
DifferentialUnitStatus::UNIT_AUTO_SKIP => 'blue',
- DifferentialUnitStatus::UNIT_POSTPONED => 'blue',
);
$icon_color = idx($colors, $diff->getUnitStatus(), 'grey');
diff --git a/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php b/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
--- a/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
+++ b/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
@@ -323,7 +323,6 @@
DifferentialLintStatus::LINT_FAIL => self::STAR_FAIL,
DifferentialLintStatus::LINT_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);
@@ -339,7 +338,6 @@
DifferentialUnitStatus::UNIT_FAIL => self::STAR_FAIL,
DifferentialUnitStatus::UNIT_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);
@@ -361,8 +359,6 @@
return pht('Lint Skipped');
case DifferentialLintStatus::LINT_AUTO_SKIP:
return pht('Automatic diff as part of commit; lint not applicable.');
- case DifferentialLintStatus::LINT_POSTPONED:
- return pht('Lint Postponed');
}
return pht('Unknown');
}
@@ -382,8 +378,6 @@
case DifferentialUnitStatus::UNIT_AUTO_SKIP:
return pht(
'Automatic diff as part of commit; unit tests not applicable.');
- case DifferentialUnitStatus::UNIT_POSTPONED:
- return pht('Unit Tests Postponed');
}
return pht('Unknown');
}
diff --git a/src/applications/harbormaster/view/HarbormasterUnitPropertyView.php b/src/applications/harbormaster/view/HarbormasterUnitPropertyView.php
--- a/src/applications/harbormaster/view/HarbormasterUnitPropertyView.php
+++ b/src/applications/harbormaster/view/HarbormasterUnitPropertyView.php
@@ -88,7 +88,6 @@
ArcanistUnitTestResult::RESULT_FAIL => pht('Failed'),
ArcanistUnitTestResult::RESULT_UNSOUND => pht('Unsound'),
ArcanistUnitTestResult::RESULT_SKIP => pht('Skipped'),
- ArcanistUnitTestResult::RESULT_POSTPONED => pht('Postponed'),
ArcanistUnitTestResult::RESULT_PASS => pht('Passed'),
);
$result = idx($names, $result, $result);

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 21, 12:36 PM (18 h, 25 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6914025
Default Alt Text
D13869.diff (7 KB)

Event Timeline

Phabricator · Built by Phacility