OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 # Copyright 2013 the V8 project authors. All rights reserved. | 2 # Copyright 2013 the V8 project authors. All rights reserved. |
3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
5 # met: | 5 # met: |
6 # | 6 # |
7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
10 # copyright notice, this list of conditions and the following | 10 # copyright notice, this list of conditions and the following |
(...skipping 1404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1415 cwd=chrome_dir), | 1415 cwd=chrome_dir), |
1416 Cmd("git show c_hash3:DEPS", c_deps % "deadbeef", cwd=chrome_dir), | 1416 Cmd("git show c_hash3:DEPS", c_deps % "deadbeef", cwd=chrome_dir), |
1417 Cmd("git log -1 --format=%B c_hash3", c_hash3_commit_log, | 1417 Cmd("git log -1 --format=%B c_hash3", c_hash3_commit_log, |
1418 cwd=chrome_dir), | 1418 cwd=chrome_dir), |
1419 Cmd("git branch -r", " weird/123\n branch-heads/7\n", cwd=chrome_dir), | 1419 Cmd("git branch -r", " weird/123\n branch-heads/7\n", cwd=chrome_dir), |
1420 Cmd("git show refs/branch-heads/7:DEPS", c_deps % "hash_345", | 1420 Cmd("git show refs/branch-heads/7:DEPS", c_deps % "hash_345", |
1421 cwd=chrome_dir), | 1421 cwd=chrome_dir), |
1422 URL("http://omahaproxy.appspot.com/all.json", """[{ | 1422 URL("http://omahaproxy.appspot.com/all.json", """[{ |
1423 "os": "win", | 1423 "os": "win", |
1424 "versions": [{ | 1424 "versions": [{ |
1425 "version": "1.1.1.1", | 1425 "version": "2.2.2.2", |
1426 "v8_version": "2.2.2.2", | 1426 "v8_version": "22.2.2.2", |
1427 "current_reldate": "04/09/15", | 1427 "current_reldate": "04/09/15", |
1428 "os": "win", | 1428 "os": "win", |
1429 "channel": "canary" | 1429 "channel": "canary", |
| 1430 "previous_version": "1.1.1.0" |
1430 }] | 1431 }] |
1431 }]"""), | 1432 }]"""), |
| 1433 URL("http://omahaproxy.appspot.com/v8.json?version=1.1.1.0", """{ |
| 1434 "chromium_version": "1.1.1.0", |
| 1435 "v8_version": "11.1.1.0" |
| 1436 }"""), |
| 1437 Cmd("git rev-list -1 11.1.1", "v8_previous_version_hash"), |
| 1438 Cmd("git rev-list -1 22.2.2.2", "v8_version_hash"), |
1432 Cmd("git checkout -f origin/master", ""), | 1439 Cmd("git checkout -f origin/master", ""), |
1433 Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], "") | 1440 Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], "") |
1434 ]) | 1441 ]) |
1435 | 1442 |
1436 args = ["-c", TEST_CONFIG["CHROMIUM"], | 1443 args = ["-c", TEST_CONFIG["CHROMIUM"], |
1437 "--json", json_output, | 1444 "--json", json_output, |
1438 "--csv", csv_output, | 1445 "--csv", csv_output, |
1439 "--max-releases", "1"] | 1446 "--max-releases", "1"] |
1440 Releases(TEST_CONFIG, self).Run(args) | 1447 Releases(TEST_CONFIG, self).Run(args) |
1441 | 1448 |
1442 # Check expected output. | 1449 # Check expected output. |
1443 csv = ("4.2.71,4.2.71,1,5678,\r\n" | 1450 csv = ("4.2.71,4.2.71,1,5678,\r\n" |
1444 "3.22.3,candidates,345,4567:5677,\r\n" | 1451 "3.22.3,candidates,345,4567:5677,\r\n" |
1445 "3.21.2,3.21,123,,\r\n" | 1452 "3.21.2,3.21,123,,\r\n" |
1446 "3.3.1.1,3.3,234,,abc12\r\n") | 1453 "3.3.1.1,3.3,234,,abc12\r\n") |
1447 self.assertEquals(csv, FileToText(csv_output)) | 1454 self.assertEquals(csv, FileToText(csv_output)) |
1448 | 1455 |
1449 expected_json = {"chrome_releases":{ | 1456 expected_json = {"chrome_releases":{ |
1450 "canaries": [ | 1457 "canaries": [ |
1451 { | 1458 { |
1452 "chrome_version": "1.1.1.1", | 1459 "chrome_version": "2.2.2.2", |
1453 "os": "win", | 1460 "os": "win", |
1454 "release_date": "04/09/15", | 1461 "release_date": "04/09/15", |
1455 "v8_version": "2.2.2.2", | 1462 "v8_version": "22.2.2.2", |
| 1463 "v8_version_hash": "v8_version_hash", |
| 1464 "v8_previous_version": "11.1.1.0", |
| 1465 "v8_previous_version_hash": "v8_previous_version_hash
" |
1456 }]}, | 1466 }]}, |
1457 "releases":[ | 1467 "releases":[ |
1458 { | 1468 { |
1459 "revision": "1", | 1469 "revision": "1", |
1460 "revision_git": "hash_456", | 1470 "revision_git": "hash_456", |
1461 "master_position": "456", | 1471 "master_position": "456", |
1462 "master_hash": "master_456", | 1472 "master_hash": "master_456", |
1463 "patches_merged": "", | 1473 "patches_merged": "", |
1464 "version": "4.2.71", | 1474 "version": "4.2.71", |
1465 "chromium_revision": "5678", | 1475 "chromium_revision": "5678", |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1533 | 1543 |
1534 Review URL: https://codereview.chromium.org/83173002 | 1544 Review URL: https://codereview.chromium.org/83173002 |
1535 | 1545 |
1536 ------------------------------------------------------------------------""") | 1546 ------------------------------------------------------------------------""") |
1537 self.assertEquals( | 1547 self.assertEquals( |
1538 """Prepare push to trunk. Now working on version 3.23.11. | 1548 """Prepare push to trunk. Now working on version 3.23.11. |
1539 | 1549 |
1540 R=danno@chromium.org | 1550 R=danno@chromium.org |
1541 | 1551 |
1542 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) | 1552 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) |
OLD | NEW |