Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Kokoro builds #1365

Merged
merged 8 commits into from Sep 27, 2018
Merged

Fix Kokoro builds #1365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
acd6eb0
do not add \r if already has it
jkwlui Sep 27, 2018
4e310e9
Merge branch 'master' into fix-windows-kokoro
jkwlui Sep 27, 2018
82c7bef
fix(tests): process.stdout.clearLine is not a function, use readline …
jkwlui Sep 27, 2018
4a7ba46
require readline
jkwlui Sep 27, 2018
8397532
process.stdout.* => readline.*
jkwlui Sep 27, 2018
da620ea
increase timeout
jkwlui Sep 27, 2018
1c128ca
Revert "increase timeout"
jkwlui Sep 27, 2018
3cb8f82
move kitchen test to system-test
jkwlui Sep 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -56,7 +56,7 @@
"prepare": "npm run compile",
"test": "nyc mocha build/test",
"docs": "echo no docs 👻",
"system-test": "echo no system tests 👻",
"system-test": "mocha build/system-test",
"samples-test": "cd samples && npm link ../ && pwd && npm test",
"lint": "gts check && eslint 'samples/**/*.js'",
"compile": "tsc -v && tsc -p . && copyfiles src/apis/**/README.md src/apis/**/package.json build",
Expand Down
5 changes: 3 additions & 2 deletions samples/drive/download.js
View file
Open in desktop
Expand Up @@ -19,6 +19,7 @@ const fs = require('fs');
const os = require('os');
const uuid = require('uuid');
const path = require('path');
const readline = require('readline');

const drive = google.drive({
version: 'v3',
Expand Down Expand Up @@ -46,8 +47,8 @@ async function runSample(fileId) {
})
.on('data', d => {
progress += d.length;
process.stdout.clearLine();
process.stdout.cursorTo(0);
readline.clearLine();
readline.cursorTo(0);
process.stdout.write(`Downloaded ${progress} bytes`);
})
.pipe(dest);
Expand Down
8 changes: 5 additions & 3 deletions samples/drive/upload.js
View file
Open in desktop
Expand Up @@ -13,8 +13,10 @@

'use strict';

const {google} = require('googleapis');
const fs = require('fs');
const readline = require('readline');

const {google} = require('googleapis');
const sampleClient = require('../sampleclient');

const drive = google.drive({
Expand All @@ -38,8 +40,8 @@ async function runSample(fileName) {
// number of bytes uploaded to this point.
onUploadProgress: evt => {
const progress = (evt.bytesRead / fileSize) * 100;
process.stdout.clearLine();
process.stdout.cursorTo(0);
readline.clearLine();
readline.cursorTo(0);
process.stdout.write(`${Math.round(progress)}% complete`);
},
}
Expand Down
8 changes: 5 additions & 3 deletions samples/youtube/upload.js
View file
Open in desktop
Expand Up @@ -17,9 +17,11 @@
* Usage: node upload.js PATH_TO_VIDEO_FILE
*/

const fs = require('fs');
const readline = require('readline');

const {google} = require('googleapis');
const sampleClient = require('../sampleclient');
const fs = require('fs');

// initialize the Youtube API library
const youtube = google.youtube({
Expand Down Expand Up @@ -52,8 +54,8 @@ async function runSample(fileName) {
// number of bytes uploaded to this point.
onUploadProgress: evt => {
const progress = (evt.bytesRead / fileSize) * 100;
process.stdout.clearLine();
process.stdout.cursorTo(0);
readline.clearLine();
readline.cursorTo(0);
process.stdout.write(`${Math.round(progress)}% complete`);
},
}
Expand Down
0 test/test.kitchen.ts → system-test/kitchen.test.ts
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions test/test.media.ts
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@ async function testMultpart(drive: drive_v2.Drive) {
res.request.headers['content-type'].indexOf('multipart/related;'), 0);
const boundary =
res.request.headers['content-type'].replace(boundaryPrefix, '');
expectedResp = expectedResp.replace(/\n/g, '\r\n')
expectedResp = expectedResp.replace(/\r?\n/g, '\r\n')
.replace(/\$boundary/g, boundary)
.replace('$media', media.body)
.replace('$resource', JSON.stringify(requestBody))
Expand All @@ -61,7 +61,7 @@ async function testMediaBody(drive: drive_v2.Drive) {
res.request.headers['content-type'].indexOf('multipart/related;'), 0);
const boundary =
res.request.headers['content-type'].replace(boundaryPrefix, '');
expectedResp = expectedResp.replace(/\n/g, '\r\n')
expectedResp = expectedResp.replace(/\r?\n/g, '\r\n')
.replace(/\$boundary/g, boundary)
.replace('$media', media.body)
.replace('$resource', JSON.stringify(requestBody))
Expand Down Expand Up @@ -309,7 +309,7 @@ describe('Media', () => {
{userId: 'me', requestBody, media});
const boundary =
res.request.headers['content-type'].replace(boundaryPrefix, '');
expectedBody = expectedBody.replace(/\n/g, '\r\n')
expectedBody = expectedBody.replace(/\r?\n/g, '\r\n')
.replace(/\$boundary/g, boundary)
.replace('$media', bodyString)
.replace('$resource', JSON.stringify(requestBody))
Expand All @@ -332,7 +332,7 @@ describe('Media', () => {
{userId: 'me', requestBody, media});
const boundary2 =
res2.request.headers['content-type'].replace(boundaryPrefix, '');
expectedBody = expectedBody.replace(/\n/g, '\r\n')
expectedBody = expectedBody.replace(/\r?\n/g, '\r\n')
.replace(/\$boundary/g, boundary2)
.replace('$media', bodyString)
.replace('$resource', JSON.stringify(requestBody))
Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
View file
Open in desktop
Expand Up @@ -8,7 +8,8 @@
"src/*.ts",
"src/**/*.ts",
"test/*.ts",
"test/**/*.ts"
"test/**/*.ts",
"system-test/**/*.ts"
],
"exclude": [
"node_modules",
Expand Down