Skip to content

Commit 401b5a0

Browse files
committed
test: remove --proxyquire-shim from bigtable, spanner, and storage
1 parent 3ab8240 commit 401b5a0

56 files changed

Lines changed: 404 additions & 53 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎handwritten/bigtable/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"presystem-test": "pnpm run compile",
4343
"system-test": "node ../../bin/run-test.cjs build/system-test --timeout 600000 --retries 3",
4444
"pretest": "pnpm run compile",
45-
"test": "node ../../bin/run-test.cjs --proxyquire-shim build/test",
45+
"test": "node ../../bin/run-test.cjs build/test",
4646
"test:snap": "SNAPSHOT_UPDATE=1 pnpm test",
4747
"testproxy": "pnpm run compile && node build/testproxy/index.js",
4848
"clean": "gts clean",

‎handwritten/bigtable/system-test/client-side-metrics-all-methods.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
import {ResourceMetrics} from '@opentelemetry/sdk-metrics';
2222
import * as assert from 'assert';
2323
import {GCPMetricsHandler} from '../src/client-side-metrics/gcp-metrics-handler';
24-
import * as proxyquire from 'proxyquire';
24+
import * as proxyquire from '../test/proxyquire';
2525
import {Bigtable, RawFilter} from '../src';
2626
import {Mutation} from '../src/mutation';
2727
import {Row} from '../src/row';

‎handwritten/bigtable/system-test/client-side-metrics.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
import {ResourceMetrics} from '@opentelemetry/sdk-metrics';
2222
import * as assert from 'assert';
2323
import {GCPMetricsHandler} from '../src/client-side-metrics/gcp-metrics-handler';
24-
import * as proxyquire from 'proxyquire';
24+
import * as proxyquire from '../test/proxyquire';
2525
import {Bigtable, BigtableOptions} from '../src';
2626
import {Row} from '../src/row';
2727
import {

‎handwritten/bigtable/system-test/gcp-metrics-handler.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import {Bigtable} from '../src';
2626
import {ResourceMetrics} from '@opentelemetry/sdk-metrics';
2727
import * as assert from 'assert';
2828
import {ClientOptions} from 'google-gax';
29-
import * as proxyquire from 'proxyquire';
29+
import * as proxyquire from '../test/proxyquire';
3030

3131
function getHandler(Exporter: typeof CloudMonitoringExporter) {
3232
const FakeCGPMetricsHandler = proxyquire(

‎handwritten/bigtable/system-test/read-rows.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import {EventEmitter} from 'events';
2626
import {Test} from './testTypes';
2727
import {ServiceError, GrpcClient, GoogleError, CallOptions} from 'google-gax';
2828
import {PassThrough} from 'stream';
29-
import * as proxyquire from 'proxyquire';
29+
import * as proxyquire from '../test/proxyquire';
3030
import {TabularApiSurface} from '../src/tabular-api-surface';
3131
import * as mocha from 'mocha';
3232
import {generateId} from './common';
@@ -141,7 +141,10 @@ describe('Bigtable/Table', () => {
141141
'An error should have been thrown because the client is closed',
142142
);
143143
} catch (err: any) {
144-
assert.strictEqual(err.message, 'The client has already been closed.');
144+
assert.strictEqual(
145+
err.message,
146+
'The client has already been closed.',
147+
);
145148
}
146149
} finally {
147150
const bigtableSecondClient = new Bigtable();

‎handwritten/bigtable/test/app-profile.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import * as promisify from '@google-cloud/promisify';
1616
import * as assert from 'assert';
1717
import {describe, it, before, beforeEach} from 'mocha';
18-
import * as proxyquire from 'proxyquire';
18+
import * as proxyquire from './proxyquire';
1919
import {CallOptions} from 'google-gax';
2020

2121
let promisified = false;

‎handwritten/bigtable/test/backup.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {PreciseDate} from '@google-cloud/precise-date';
1616
import * as promisify from '@google-cloud/promisify';
1717
import * as assert from 'assert';
1818
import {before, beforeEach, describe, it, afterEach} from 'mocha';
19-
import * as proxyquire from 'proxyquire';
19+
import * as proxyquire from './proxyquire';
2020
import * as pumpify from 'pumpify';
2121
import {ServiceError} from 'google-gax';
2222

‎handwritten/bigtable/test/base64keymap.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import * as assert from 'assert';
1616
import {describe, it, before, beforeEach, afterEach} from 'mocha';
1717
import Long = require('long');
18-
import * as proxyquire from 'proxyquire';
1918
import * as sn from 'sinon';
2019

2120
import {RowStateEnum} from '../src/chunktransformer.js';

‎handwritten/bigtable/test/chunktransformer.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import * as assert from 'assert';
1616
import {describe, it, before, beforeEach, afterEach} from 'mocha';
1717
import Long = require('long');
18-
import * as proxyquire from 'proxyquire';
18+
import * as proxyquire from './proxyquire';
1919
import * as sn from 'sinon';
2020

2121
import {RowStateEnum} from '../src/chunktransformer.js';

‎handwritten/bigtable/test/cluster.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import * as promisify from '@google-cloud/promisify';
1616
import * as assert from 'assert';
1717
import {before, beforeEach, describe, it} from 'mocha';
18-
import * as proxyquire from 'proxyquire';
18+
import * as proxyquire from './proxyquire';
1919
import {PassThrough, Readable} from 'stream';
2020
import {CallOptions} from 'google-gax';
2121
import {PreciseDate} from '@google-cloud/precise-date';

0 commit comments

Comments
 (0)