Skip to content

Commit 878bae9

Browse files
authored
[mixed-reality-remote-rendering] migrate to new recorder (Azure#20217)
Part of work towards Azure#19859
1 parent 63ae935 commit 878bae9

22 files changed

+5846
-1144
lines changed

sdk/remoterendering/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ extends:
2727
template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
2828
parameters:
2929
ServiceDirectory: remoterendering
30+
TestProxy: true
3031
Artifacts:
3132
- name: azure-mixed-reality-remote-rendering
3233
safeName: azuremixedrealityremoterendering

sdk/remoterendering/mixed-reality-remote-rendering/karma.conf.js

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@
44
// https://github.com/karma-runner/karma-chrome-launcher
55
process.env.CHROME_BIN = require("puppeteer").executablePath();
66
require("dotenv").config();
7-
const {
8-
jsonRecordingFilterFunction,
9-
isPlaybackMode,
10-
isSoftRecordMode,
11-
isRecordMode,
12-
} = require("@azure-tools/test-recorder");
7+
const { relativeRecordingsPath } = require("@azure-tools/test-recorder");
8+
process.env.RECORDINGS_RELATIVE_PATH = relativeRecordingsPath();
139

1410
module.exports = function (config) {
1511
config.set({
@@ -30,15 +26,14 @@ module.exports = function (config) {
3026
"karma-env-preprocessor",
3127
"karma-coverage",
3228
"karma-junit-reporter",
33-
"karma-json-to-file-reporter",
3429
"karma-json-preprocessor",
3530
],
3631

3732
// list of files / patterns to load in the browser
3833
files: [
3934
"dist-test/index.browser.js",
4035
{ pattern: "dist-test/index.browser.js.map", type: "html", included: false, served: true },
41-
].concat(isPlaybackMode() || isSoftRecordMode() ? ["recordings/browsers/**/*.json"] : []),
36+
],
4237

4338
// list of files / patterns to exclude
4439
exclude: [],
@@ -65,12 +60,13 @@ module.exports = function (config) {
6560
"AZURE_CLIENT_ID",
6661
"AZURE_CLIENT_SECRET",
6762
"AZURE_TENANT_ID",
63+
"RECORDINGS_RELATIVE_PATH",
6864
],
6965

7066
// test results reporter to use
7167
// possible values: 'dots', 'progress'
7268
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
73-
reporters: ["mocha", "coverage", "junit", "json-to-file"],
69+
reporters: ["mocha", "coverage", "junit"],
7470

7571
coverageReporter: {
7672
// specify a common output directory
@@ -88,11 +84,6 @@ module.exports = function (config) {
8884
properties: {}, // key value pair of properties to add to the <properties> section of the report
8985
},
9086

91-
jsonToFileReporter: {
92-
filter: jsonRecordingFilterFunction,
93-
outputPath: ".",
94-
},
95-
9687
// web server port
9788
port: 9876,
9889

@@ -127,9 +118,6 @@ module.exports = function (config) {
127118
browserNoActivityTimeout: 1000000,
128119
browserDisconnectTimeout: 10000,
129120
browserDisconnectTolerance: 3,
130-
browserConsoleLogOptions: {
131-
terminal: !isRecordMode(),
132-
},
133121

134122
client: {
135123
mocha: {

sdk/remoterendering/mixed-reality-remote-rendering/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@
3838
"extract-api": "tsc -p . && api-extractor run --local",
3939
"format": "prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"",
4040
"generate:client": "autorest --typescript ./swagger/README.md",
41-
"integration-test:browser": "karma start --single-run",
42-
"integration-test:node": "nyc mocha -r esm --require source-map-support/register --reporter ../../../common/tools/mocha-multi-reporter.js --timeout 5000000 --full-trace \"dist-esm/test/{,!(browser)/**/}/*.spec.js\"",
41+
"integration-test:browser": "dev-tool run test:browser",
42+
"integration-test:node": "dev-tool run test:node-js-input -- --timeout 5000000 --full-trace 'dist-esm/test/**/*.spec.js'",
4343
"integration-test": "npm run integration-test:node && npm run integration-test:browser",
4444
"lint:fix": "eslint package.json api-extractor.json src test --ext .ts --fix --fix-type [problem,suggestion]",
4545
"lint": "eslint package.json api-extractor.json src test --ext .ts",
4646
"pack": "npm pack 2>&1",
4747
"test:browser": "npm run build:test && npm run unit-test:browser && npm run integration-test:browser",
4848
"test:node": "npm run build:test && npm run unit-test:node && npm run integration-test:node",
4949
"test": "npm run build:test && npm run unit-test && npm run integration-test",
50-
"unit-test:browser": "karma start --single-run",
51-
"unit-test:node": "mocha -r esm --require ts-node/register --reporter ../../../common/tools/mocha-multi-reporter.js --timeout 1200000 --full-trace \"test/{,!(browser)/**/}/*.spec.ts\"",
50+
"unit-test:browser": "dev-tool run test:browser",
51+
"unit-test:node": "dev-tool run test:node-ts-input --timeout 1200000 --full-trace 'test/**/*.spec.ts'",
5252
"unit-test": "npm run unit-test:node && npm run unit-test:browser"
5353
},
5454
"files": [
@@ -92,7 +92,7 @@
9292
"@azure/dev-tool": "^1.0.0",
9393
"@azure/eslint-plugin-azure-sdk": "^3.0.0",
9494
"@azure/identity": "^2.0.1",
95-
"@azure-tools/test-recorder": "^1.0.0",
95+
"@azure-tools/test-recorder": "^2.0.0",
9696
"@microsoft/api-extractor": "^7.18.11",
9797
"@types/chai": "^4.1.6",
9898
"@types/chai-as-promised": "^7.1.0",

0 commit comments

Comments
 (0)