Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(800)

Unified Diff: scripts/slave/recipes/ios/unified_builder_tester.py

Issue 2455433002: Convert chromium.mac, chromium.fyi iOS bots to run tests on Swarming (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/ios/unified_builder_tester.py
diff --git a/scripts/slave/recipes/ios/unified_builder_tester.py b/scripts/slave/recipes/ios/unified_builder_tester.py
index b011d99580ed54968eca5d768c49654f94b04623..faaa642b4a6c353d66d35e4c921a2f954b1ba05b 100644
--- a/scripts/slave/recipes/ios/unified_builder_tester.py
+++ b/scripts/slave/recipes/ios/unified_builder_tester.py
@@ -6,6 +6,7 @@ DEPS = [
'ios',
'recipe_engine/platform',
'recipe_engine/properties',
+ 'recipe_engine/raw_io',
]
def RunSteps(api):
@@ -13,7 +14,7 @@ def RunSteps(api):
api.ios.checkout()
api.ios.read_build_config()
api.ios.build()
- api.ios.test()
+ api.ios.test_swarming()
def GenTests(api):
yield (
@@ -57,29 +58,10 @@ def GenTests(api):
},
],
})
- )
-
- yield (
- api.test('no_tests')
- + api.platform('mac', 64)
- + api.properties(
- buildername='ios',
- buildnumber='0',
- mastername='chromium.fake',
- slavename='fake-vm',
- path_config='kitchen',
+ + api.step_data(
+ 'bootstrap swarming.swarming.py --version',
+ stdout=api.raw_io.output('1.2.3'),
)
- + api.ios.make_test_build_config({
- 'xcode version': 'fake xcode version',
- 'GYP_DEFINES': {
- 'fake gyp define 1': 'fake value 1',
- 'fake gyp define 2': 'fake value 2',
- },
- 'configuration': 'Release',
- 'sdk': 'iphoneos8.0',
- 'tests': [
- ],
- })
)
yield (
@@ -104,6 +86,10 @@ def GenTests(api):
'tests': [
],
})
+ + api.step_data(
+ 'bootstrap swarming.swarming.py --version',
+ stdout=api.raw_io.output('1.2.3'),
+ )
)
yield (
@@ -129,143 +115,8 @@ def GenTests(api):
'tests': [
],
})
- )
-
- yield (
- api.test('test_failure')
- + api.platform('mac', 64)
- + api.properties(
- buildername='ios',
- buildnumber='0',
- mastername='chromium.fake',
- slavename='fake-vm',
- path_config='kitchen',
- )
- + api.ios.make_test_build_config({
- 'xcode version': 'fake xcode version',
- 'GYP_DEFINES': {
- 'fake gyp define 1': 'fake value 1',
- 'fake gyp define 2': 'fake value 2',
- },
- 'configuration': 'Debug',
- 'sdk': 'iphonesimulator8.0',
- 'tests': [
- {
- 'app': 'fake tests 1',
- 'device type': 'fake device',
- 'os': '8.0',
- },
- {
- 'app': 'fake tests 2',
- 'device type': 'fake device',
- 'os': '7.1',
- },
- ],
- })
- + api.step_data(
- 'fake tests 1 (fake device iOS 8.0)',
- retcode=1
- )
- )
-
- yield (
- api.test('infrastructure_failure')
- + api.platform('mac', 64)
- + api.properties(
- buildername='ios',
- buildnumber='0',
- mastername='chromium.fake',
- slavename='fake-vm',
- path_config='kitchen',
- )
- + api.ios.make_test_build_config({
- 'xcode version': 'fake xcode version',
- 'GYP_DEFINES': {
- 'fake gyp define 1': 'fake value 1',
- 'fake gyp define 2': 'fake value 2',
- },
- 'configuration': 'Debug',
- 'sdk': 'iphonesimulator8.0',
- 'tests': [
- {
- 'app': 'fake tests 1',
- 'device type': 'fake device',
- 'os': '8.0',
- },
- {
- 'app': 'fake tests 2',
- 'device type': 'fake device',
- 'os': '7.1',
- },
- ],
- })
- + api.step_data(
- 'fake tests 1 (fake device iOS 8.0)',
- retcode=2,
- )
- )
-
- yield (
- api.test('multiple_failures')
- + api.platform('mac', 64)
- + api.properties(
- buildername='ios',
- buildnumber='0',
- mastername='chromium.fake',
- slavename='fake-vm',
- path_config='kitchen',
- )
- + api.ios.make_test_build_config({
- 'xcode version': 'fake xcode version',
- 'GYP_DEFINES': {
- 'fake gyp define 1': 'fake value 1',
- 'fake gyp define 2': 'fake value 2',
- },
- 'configuration': 'Debug',
- 'sdk': 'iphonesimulator7.1',
- 'tests': [
- {
- 'app': 'fake tests 1',
- 'device type': 'fake device',
- 'os': '8.1',
- },
- {
- 'app': 'fake tests 2',
- 'device type': 'fake device',
- 'os': '8.1',
- },
- {
- 'app': 'fake tests 3',
- 'device type': 'fake device',
- 'os': '8.1',
- },
- {
- 'app': 'fake tests 4',
- 'device type': 'fake device',
- 'os': '8.1',
- },
- {
- 'app': 'fake tests 5',
- 'device type': 'fake device',
- 'os': '8.1',
- },
- {
- 'app': 'fake tests 6',
- 'device type': 'fake device',
- 'os': '8.1',
- },
- ],
- })
- + api.step_data(
- 'fake tests 2 (fake device iOS 8.1)',
- retcode=1
- )
- + api.step_data(
- 'fake tests 3 (fake device iOS 8.1)',
- retcode=1
- )
+ api.step_data(
- 'fake tests 5 (fake device iOS 8.1)',
- retcode=2
+ 'bootstrap swarming.swarming.py --version',
+ stdout=api.raw_io.output('1.2.3'),
)
)

Powered by Google App Engine
This is Rietveld 408576698