mirror of
https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
synced 2025-05-05 23:51:34 +00:00
autopkgtest: switch from testing=series to testing=testing
This commit is contained in:
parent
5ae8ccbcc6
commit
278b3dcdd0
@ -422,7 +422,7 @@ class Britney(object):
|
|||||||
help="Compute which packages can migrate (the default)")
|
help="Compute which packages can migrate (the default)")
|
||||||
parser.add_option("", "--no-compute-migrations", action="store_false", dest="compute_migrations",
|
parser.add_option("", "--no-compute-migrations", action="store_false", dest="compute_migrations",
|
||||||
help="Do not compute which packages can migrate.")
|
help="Do not compute which packages can migrate.")
|
||||||
parser.add_option("", "--series", action="store", dest="series", default='series',
|
parser.add_option("", "--series", action="store", dest="series", default='testing',
|
||||||
help="set distribution series name")
|
help="set distribution series name")
|
||||||
(self.options, self.args) = parser.parse_args()
|
(self.options, self.args) = parser.parse_args()
|
||||||
|
|
||||||
|
@ -162,7 +162,7 @@ class TestData:
|
|||||||
'''
|
'''
|
||||||
self.path = tempfile.mkdtemp(prefix='testarchive.')
|
self.path = tempfile.mkdtemp(prefix='testarchive.')
|
||||||
self.apt_source = 'deb file://%s /' % self.path
|
self.apt_source = 'deb file://%s /' % self.path
|
||||||
self.suite_testing = 'series'
|
self.suite_testing = 'testing'
|
||||||
self.suite_unstable = 'unstable'
|
self.suite_unstable = 'unstable'
|
||||||
self.compute_migrations = ''
|
self.compute_migrations = ''
|
||||||
self.dirs = {False: os.path.join(self.path, 'data', self.suite_testing),
|
self.dirs = {False: os.path.join(self.path, 'data', self.suite_testing),
|
||||||
@ -343,17 +343,17 @@ class TestBase(unittest.TestCase):
|
|||||||
self.britney_conf = os.path.join(self.data.path, 'britney.conf')
|
self.britney_conf = os.path.join(self.data.path, 'britney.conf')
|
||||||
with open(self.britney_conf, 'w') as f:
|
with open(self.britney_conf, 'w') as f:
|
||||||
f.write('''
|
f.write('''
|
||||||
TESTING = data/series
|
TESTING = data/testing
|
||||||
UNSTABLE = data/unstable
|
UNSTABLE = data/unstable
|
||||||
|
|
||||||
NONINST_STATUS = data/series/non-installable-status
|
NONINST_STATUS = data/testing/non-installable-status
|
||||||
EXCUSES_OUTPUT = output/excuses.html
|
EXCUSES_OUTPUT = output/excuses.html
|
||||||
EXCUSES_YAML_OUTPUT = output/excuses.yaml
|
EXCUSES_YAML_OUTPUT = output/excuses.yaml
|
||||||
UPGRADE_OUTPUT = output/output.txt
|
UPGRADE_OUTPUT = output/output.txt
|
||||||
HEIDI_OUTPUT = output/HeidiResult
|
HEIDI_OUTPUT = output/HeidiResult
|
||||||
|
|
||||||
STATIC_INPUT_DIR = data/series/input
|
STATIC_INPUT_DIR = data/testing/input
|
||||||
STATE_DIR = data/series/state
|
STATE_DIR = data/testing/state
|
||||||
|
|
||||||
ARCHITECTURES = amd64 arm64 armhf i386 powerpc ppc64el
|
ARCHITECTURES = amd64 arm64 armhf i386 powerpc ppc64el
|
||||||
NOBREAKALL_ARCHES = amd64 arm64 armhf i386 powerpc ppc64el
|
NOBREAKALL_ARCHES = amd64 arm64 armhf i386 powerpc ppc64el
|
||||||
|
@ -156,15 +156,15 @@ class AutoPkgTestSwiftServer:
|
|||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
srv = AutoPkgTestSwiftServer()
|
srv = AutoPkgTestSwiftServer()
|
||||||
srv.set_results({'autopkgtest-series': {
|
srv.set_results({'autopkgtest-testing': {
|
||||||
'series/i386/d/darkgreen/20150101_100000@': (0, 'darkgreen 1'),
|
'testing/i386/d/darkgreen/20150101_100000@': (0, 'darkgreen 1'),
|
||||||
'series/i386/g/green/20150101_100000@': (0, 'green 1', {'custom_environment': ['ADT_TEST_TRIGGERS=green']}),
|
'testing/i386/g/green/20150101_100000@': (0, 'green 1', {'custom_environment': ['ADT_TEST_TRIGGERS=green']}),
|
||||||
'series/i386/l/lightgreen/20150101_100000@': (0, 'lightgreen 1'),
|
'testing/i386/l/lightgreen/20150101_100000@': (0, 'lightgreen 1'),
|
||||||
'series/i386/l/lightgreen/20150101_100101@': (4, 'lightgreen 2'),
|
'testing/i386/l/lightgreen/20150101_100101@': (4, 'lightgreen 2'),
|
||||||
'series/i386/l/lightgreen/20150101_100102@': (0, 'lightgreen 3'),
|
'testing/i386/l/lightgreen/20150101_100102@': (0, 'lightgreen 3'),
|
||||||
}})
|
}})
|
||||||
srv.start()
|
srv.start()
|
||||||
print('Running on http://localhost:8080/autopkgtest-series')
|
print('Running on http://localhost:8080/autopkgtest-testing')
|
||||||
print('Press Enter to quit.')
|
print('Press Enter to quit.')
|
||||||
sys.stdin.readline()
|
sys.stdin.readline()
|
||||||
srv.stop()
|
srv.stop()
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user