From 5c33c8121c74914af26890f2fd60bfffc82eb4ef Mon Sep 17 00:00:00 2001 From: Caleb Cartwright <calebcartwright@users.noreply.github.com> Date: Tue, 12 Nov 2019 19:18:09 -0600 Subject: [PATCH] tests: fix flaky mozilla service tests (#4321) --- .../mozilla-observatory/mozilla-observatory.tester.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/services/mozilla-observatory/mozilla-observatory.tester.js b/services/mozilla-observatory/mozilla-observatory.tester.js index 8a6f32f439..d9e6febbd0 100644 --- a/services/mozilla-observatory/mozilla-observatory.tester.js +++ b/services/mozilla-observatory/mozilla-observatory.tester.js @@ -3,7 +3,6 @@ const Joi = require('@hapi/joi') const t = (module.exports = require('../tester').createServiceTester()) -const validColors = ['brightgreen', 'green', 'yellow', 'orange', 'red'] const isMessage = Joi.alternatives() .try( Joi.string().regex(/^[ABCDEF][+-]? \([0-9]{1,3}\/100\)$/), @@ -11,24 +10,20 @@ const isMessage = Joi.alternatives() ) .required() -const isColor = Joi.string() - .valid(...validColors) - .required() - t.create('request on observatory.mozilla.org') + .timeout(10000) .get('/grade-score/observatory.mozilla.org.json') .expectBadge({ label: 'observatory', message: isMessage, - color: isColor, }) t.create('request on observatory.mozilla.org with inclusion in public results') + .timeout(10000) .get('/grade-score/observatory.mozilla.org.json?publish') .expectBadge({ label: 'observatory', message: isMessage, - color: isColor, }) t.create('grade without score (mock)') -- GitLab