describe("/api/report-commits/", function () {
var emptyReport = {
- "builderName": "someBuilder",
- "builderPassword": "somePassword",
+ "slaveName": "someSlave",
+ "slavePassword": "somePassword",
};
var subversionCommit = {
- "builderName": "someBuilder",
- "builderPassword": "somePassword",
+ "slaveName": "someSlave",
+ "slavePassword": "somePassword",
"commits": [
{
"repository": "WebKit",
],
};
var subversionInvalidCommit = {
- "builderName": "someBuilder",
- "builderPassword": "somePassword",
+ "slaveName": "someSlave",
+ "slavePassword": "somePassword",
"commits": [
{
"repository": "WebKit",
],
};
var subversionTwoCommits = {
- "builderName": "someBuilder",
- "builderPassword": "somePassword",
+ "slaveName": "someSlave",
+ "slavePassword": "somePassword",
"commits": [
{
"repository": "WebKit",
]
}
- function addBuilder(report, callback) {
- queryAndFetchAll('INSERT INTO builders (builder_name, builder_password_hash) values ($1, $2)',
- [report.builderName, sha256(report.builderPassword)], callback);
+ function addSlave(report, callback) {
+ queryAndFetchAll('INSERT INTO build_slaves (slave_name, slave_password_hash) values ($1, $2)',
+ [report.slaveName, sha256(report.slavePassword)], callback);
}
- it("should reject error when builder name is missing", function () {
+ it("should reject error when slave name is missing", function () {
postJSON('/api/report-commits/', {}, function (response) {
assert.equal(response.statusCode, 200);
- assert.equal(JSON.parse(response.responseText)['status'], 'MissingBuilderName');
+ assert.equal(JSON.parse(response.responseText)['status'], 'MissingSlaveName');
notifyDone();
});
});
- it("should reject when there are no builders", function () {
+ it("should reject when there are no slaves", function () {
postJSON('/api/report-commits/', emptyReport, function (response) {
assert.equal(response.statusCode, 200);
assert.notEqual(JSON.parse(response.responseText)['status'], 'OK');
});
it("should accept an empty report", function () {
- addBuilder(emptyReport, function () {
+ addSlave(emptyReport, function () {
postJSON('/api/report-commits/', emptyReport, function (response) {
assert.equal(response.statusCode, 200);
assert.equal(JSON.parse(response.responseText)['status'], 'OK');
});
it("should add a missing repository", function () {
- addBuilder(subversionCommit, function () {
+ addSlave(subversionCommit, function () {
postJSON('/api/report-commits/', subversionCommit, function (response) {
assert.equal(response.statusCode, 200);
assert.equal(JSON.parse(response.responseText)['status'], 'OK');
});
});
- it("should store a commit from a valid builder", function () {
- addBuilder(subversionCommit, function () {
+ it("should store a commit from a valid slave", function () {
+ addSlave(subversionCommit, function () {
postJSON('/api/report-commits/', subversionCommit, function (response) {
assert.equal(response.statusCode, 200);
assert.equal(JSON.parse(response.responseText)['status'], 'OK');
});
it("should reject an invalid revision number", function () {
- addBuilder(subversionCommit, function () {
+ addSlave(subversionCommit, function () {
subversionCommit
postJSON('/api/report-commits/', subversionInvalidCommit, function (response) {
assert.equal(response.statusCode, 200);
});
});
- it("should store two commits from a valid builder", function () {
- addBuilder(subversionTwoCommits, function () {
+ it("should store two commits from a valid slave", function () {
+ addSlave(subversionTwoCommits, function () {
postJSON('/api/report-commits/', subversionTwoCommits, function (response) {
assert.equal(response.statusCode, 200);
assert.equal(JSON.parse(response.responseText)['status'], 'OK');
[repositoryId, reportedData['revision'], reportedData['time']], function (existingCommits) {
var commitId = existingCommits[0]['commit_id'];
assert.equal(existingCommits[0]['commit_message'], null);
- addBuilder(subversionCommit, function () {
+ addSlave(subversionCommit, function () {
postJSON('/api/report-commits/', subversionCommit, function (response) {
assert.equal(response.statusCode, 200);
assert.equal(JSON.parse(response.responseText)['status'], 'OK');
reportedData = subversionTwoCommits.commits[0];
queryAndFetchAll('INSERT INTO commits (commit_repository, commit_revision, commit_time) VALUES ($1, $2, $3) RETURNING *',
[repositoryId, reportedData['revision'], reportedData['time']], function () {
- addBuilder(subversionCommit, function () {
+ addSlave(subversionCommit, function () {
postJSON('/api/report-commits/', subversionCommit, function (response) {
assert.equal(response.statusCode, 200);
assert.equal(JSON.parse(response.responseText)['status'], 'OK');
queryAndFetchAll('INSERT INTO repositories (repository_id, repository_name) VALUES (1, \'WebKit\')', [], function () {
var author = subversionCommit.commits[0]['author'];
queryAndFetchAll('INSERT INTO committers (committer_repository, committer_account) VALUES (1, $1)', [author['account']], function () {
- addBuilder(subversionCommit, function () {
+ addSlave(subversionCommit, function () {
postJSON('/api/report-commits/', subversionCommit, function (response) {
assert.equal(response.statusCode, 200);
assert.equal(JSON.parse(response.responseText)['status'], 'OK');
def main(argv):
if len(argv) < 7:
- sys.exit('Usage: pull-svn <repository-name> <repository-URL> <dashboard-URL> <builder-name> <builder-password> <seconds-to-sleep> [<account-to-name-helper>]')
+ sys.exit('Usage: pull-svn <repository-name> <repository-URL> <dashboard-URL> <slave-name> <slave-password> <seconds-to-sleep> [<account-to-name-helper>]')
repository_name = argv[1]
repository_url = argv[2]
dashboard_url = argv[3]
- builder_name = argv[4]
- builder_password = argv[5]
+ slave_name = argv[4]
+ slave_password = argv[5]
seconds_to_sleep = float(argv[6])
account_to_name_helper = argv[7] if len(argv) > 7 else None
if not commit or len(pending_commits_to_send) >= 10:
if pending_commits_to_send:
print "Submitting the above commits to %s..." % dashboard_url
- submit_commits(pending_commits_to_send, dashboard_url, builder_name, builder_password)
+ submit_commits(pending_commits_to_send, dashboard_url, slave_name, slave_password)
print "Successfully submitted."
pending_commits_to_send = []
time.sleep(seconds_to_sleep)
return output.strip()
-def submit_commits(commits, dashboard_url, builder_name, builder_password):
+def submit_commits(commits, dashboard_url, slave_name, slave_password):
try:
payload = json.dumps({
- 'builderName': builder_name,
- 'builderPassword': builder_password,
+ 'slaveName': slave_name,
+ 'slavePassword': slave_password,
'commits': commits,
})
request = urllib2.Request(dashboard_url + '/api/report-commits')