From c9f7ef6fce46ea1d7aa17abec92455db047b9a78 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@canonical.com>
Date: Tue, 16 Feb 2016 10:18:43 +0100
Subject: [PATCH] Adjust URL for retrying failed tests
retry.cgi is now request.cgi.
---
britney.py | 2 +-
tests/test_autopkgtest.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/britney.py b/britney.py
index ee4df94..f7ece67 100755
--- a/britney.py
+++ b/britney.py
@@ -1960,7 +1960,7 @@ class Britney(object):
'h': srchash(adtsrc), 's': adtsrc,
'r': self.options.series, 'a': arch}
if status == 'REGRESSION':
- kwargs['retry_url'] = 'https://autopkgtest.ubuntu.com/retry.cgi?' + \
+ kwargs['retry_url'] = 'https://autopkgtest.ubuntu.com/request.cgi?' + \
urlencode([('release', self.options.series),
('arch', arch),
('package', adtsrc),
diff --git a/tests/test_autopkgtest.py b/tests/test_autopkgtest.py
index d1ae6a1..32e2085 100755
--- a/tests/test_autopkgtest.py
+++ b/tests/test_autopkgtest.py
@@ -435,7 +435,7 @@ class T(TestBase):
# seaprately)
link = urllib.parse.urlparse(exc['green']['tests']['autopkgtest']['lightgreen 1']['amd64'][4])
self.assertEqual(link.netloc, 'autopkgtest.ubuntu.com')
- self.assertEqual(link.path, '/retry.cgi')
+ self.assertEqual(link.path, '/request.cgi')
self.assertEqual(urllib.parse.parse_qs(link.query),
{'release': ['series'], 'arch': ['amd64'],
'package': ['lightgreen'], 'trigger': ['green/2']})
@@ -1646,7 +1646,7 @@ class T(TestBase):
'http://localhost:18085/autopkgtest-series-awesome-developers-staging/series/i386/l/lightgreen/20150101_100100@/log.gz',
None,
'http://localhost:18085/autopkgtest-series-awesome-developers-staging/series/i386/l/lightgreen/20150101_100100@/artifacts.tar.gz',
- 'https://autopkgtest.ubuntu.com/retry.cgi?release=series&arch=i386&package=lightgreen&trigger=lightgreen%2F2&ppa=joe%2Ffoo&ppa=awesome-developers%2Fstaging']}
+ 'https://autopkgtest.ubuntu.com/request.cgi?release=series&arch=i386&package=lightgreen&trigger=lightgreen%2F2&ppa=joe%2Ffoo&ppa=awesome-developers%2Fstaging']}
}})
self.assertEqual(self.amqp_requests, set())
self.assertEqual(self.pending_requests, {})