Index: third_party/WebKit/Tools/Scripts/webkitpy/common/net/rietveld_unittest.py |
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/net/rietveld_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/net/rietveld_unittest.py |
index 4614c5ac35c4b0ea19bca507bc123cf9aeaa68bb..c769953658dd9bd27841f18f044bfb8e42245b1f 100644 |
--- a/third_party/WebKit/Tools/Scripts/webkitpy/common/net/rietveld_unittest.py |
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/common/net/rietveld_unittest.py |
@@ -25,13 +25,13 @@ class RietveldTest(unittest.TestCase): |
'https://codereview.chromium.org/api/11112222/2': json.dumps({ |
'try_job_results': [ |
{ |
- 'builder': 'some builder', |
- 'master': 'some master', |
+ 'builder': 'foo-builder', |
+ 'master': 'master.tryserver.foo', |
'buildnumber': 10, |
}, |
{ |
- 'builder': 'my builder', |
- 'master': 'my master', |
+ 'builder': 'bar-builder', |
+ 'master': 'master.tryserver.bar', |
'buildnumber': 50, |
}, |
], |
@@ -39,24 +39,24 @@ class RietveldTest(unittest.TestCase): |
'https://codereview.chromium.org/api/11112222/3': json.dumps({ |
'try_job_results': [ |
{ |
- 'builder': 'some builder', |
- 'master': 'some master', |
+ 'builder': 'foo-builder', |
+ 'master': 'master.tryserver.foo', |
'buildnumber': 20, |
}, |
{ |
- 'builder': 'my builder', |
- 'master': 'my master', |
+ 'builder': 'bar-builder', |
+ 'master': 'master.tryserver.bar', |
'buildnumber': 60, |
}, |
], |
}), |
- 'https://codereview.chromium.org/api/11113333': 'my non-json contents', |
+ 'https://codereview.chromium.org/api/11113333': 'my non-JSON contents', |
}) |
def test_latest_try_jobs(self): |
self.assertEqual( |
- latest_try_jobs(11112222, ('my builder', 'my other builder'), self.web), |
- [TryJob('my builder', 'my master', 60)]) |
+ latest_try_jobs(11112222, ('bar-builder', 'other-builder'), self.web), |
+ [TryJob('bar-builder', 'tryserver.bar', 60)]) |
def test_latest_try_jobs_http_error(self): |
def raise_error(_): |
@@ -65,7 +65,7 @@ class RietveldTest(unittest.TestCase): |
oc = OutputCapture() |
try: |
oc.capture_output() |
- self.assertEqual(latest_try_jobs(11112222, ('my builder',), self.web), []) |
+ self.assertEqual(latest_try_jobs(11112222, ('bar-builder',), self.web), []) |
finally: |
_, _, logs = oc.restore_output() |
self.assertEqual(logs, 'Request failed to URL: https://codereview.chromium.org/api/11112222\n') |
@@ -74,15 +74,15 @@ class RietveldTest(unittest.TestCase): |
oc = OutputCapture() |
try: |
oc.capture_output() |
- self.assertEqual(latest_try_jobs(11113333, ('my builder',), self.web), []) |
+ self.assertEqual(latest_try_jobs(11113333, ('bar-builder',), self.web), []) |
finally: |
_, _, logs = oc.restore_output() |
- self.assertEqual(logs, 'Invalid JSON: my non-json contents\n') |
+ self.assertEqual(logs, 'Invalid JSON: my non-JSON contents\n') |
def test_latest_try_jobs_with_patchset(self): |
self.assertEqual( |
- latest_try_jobs(11112222, ('my builder', 'my other builder'), self.web, patchset_number=2), |
- [TryJob('my builder', 'my master', 50)]) |
+ latest_try_jobs(11112222, ('bar-builder', 'other-builder'), self.web, patchset_number=2), |
+ [TryJob('bar-builder', 'tryserver.bar', 50)]) |
def test_latest_try_jobs_no_relevant_builders(self): |
self.assertEqual(latest_try_jobs(11112222, ('foo', 'bar'), self.web), []) |