@testomatio/reporter 1.2.4-beta → 1.3.0-ignore-stack-for-passed.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +61 -54
- package/lib/adapter/codecept.js +96 -35
- package/lib/adapter/cucumber/current.js +19 -12
- package/lib/adapter/cucumber/legacy.js +8 -7
- package/lib/adapter/cucumber.js +2 -2
- package/lib/adapter/cypress-plugin/index.js +52 -25
- package/lib/adapter/jasmine.js +1 -1
- package/lib/adapter/jest.js +49 -16
- package/lib/adapter/mocha.js +103 -51
- package/lib/adapter/playwright.js +80 -27
- package/lib/adapter/webdriver.js +1 -1
- package/lib/bin/reportXml.js +14 -13
- package/lib/bin/startTest.js +27 -6
- package/lib/client.js +192 -69
- package/lib/config.js +34 -0
- package/lib/constants.js +19 -7
- package/lib/data-storage.js +203 -0
- package/lib/fileUploader.js +128 -53
- package/lib/junit-adapter/adapter.js +0 -2
- package/lib/junit-adapter/csharp.js +3 -4
- package/lib/junit-adapter/index.js +3 -3
- package/lib/junit-adapter/java.js +35 -17
- package/lib/junit-adapter/javascript.js +1 -2
- package/lib/junit-adapter/python.js +12 -14
- package/lib/junit-adapter/ruby.js +1 -2
- package/lib/pipe/csv.js +5 -3
- package/lib/pipe/github.js +27 -39
- package/lib/pipe/gitlab.js +20 -24
- package/lib/pipe/html.js +317 -0
- package/lib/pipe/index.js +3 -1
- package/lib/pipe/testomatio.js +189 -56
- package/lib/reporter-functions.js +46 -0
- package/lib/reporter.js +11 -9
- package/lib/services/artifacts.js +57 -0
- package/lib/services/index.js +13 -0
- package/lib/services/key-values.js +58 -0
- package/lib/services/logger.js +311 -0
- package/lib/template/template-draft.hbs +249 -0
- package/lib/template/testomatio.hbs +388 -0
- package/lib/utils/pipe_utils.js +128 -0
- package/lib/{util.js → utils/utils.js} +144 -12
- package/lib/xmlReader.js +211 -122
- package/package.json +18 -7
- package/lib/_ArtifactStorageOld.js +0 -142
- package/lib/artifactStorage.js +0 -25
- package/lib/dataStorage.js +0 -241
- package/lib/helpers.js +0 -34
- package/lib/logger.js +0 -293
|
@@ -0,0 +1,203 @@
|
|
|
1
|
+
const debug = require('debug')('@testomatio/reporter:storage');
|
|
2
|
+
const fs = require('fs');
|
|
3
|
+
const path = require('path');
|
|
4
|
+
const os = require('os');
|
|
5
|
+
const { join } = require('path');
|
|
6
|
+
const { TESTOMAT_TMP_STORAGE_DIR } = require('./constants');
|
|
7
|
+
const { fileSystem, testRunnerHelper } = require('./utils/utils');
|
|
8
|
+
const crypto = require('crypto');
|
|
9
|
+
|
|
10
|
+
class DataStorage {
|
|
11
|
+
static #instance;
|
|
12
|
+
|
|
13
|
+
context;
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
*
|
|
17
|
+
* @returns {DataStorage}
|
|
18
|
+
*/
|
|
19
|
+
static getInstance() {
|
|
20
|
+
if (!this.#instance) {
|
|
21
|
+
this.#instance = new DataStorage();
|
|
22
|
+
}
|
|
23
|
+
return this.#instance;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
setContext(context) {
|
|
27
|
+
this.context = context;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
/**
|
|
31
|
+
* Creates data storage instance as singleton
|
|
32
|
+
* Stores data to global variable or to file depending on what is applicable for current test runner (adapter)
|
|
33
|
+
* Recommend to use composition while using this class (instead of inheritance).
|
|
34
|
+
* ! Also the class which will use data storage should be singleton (to avoid data loss).
|
|
35
|
+
*/
|
|
36
|
+
constructor() {
|
|
37
|
+
// some frameworks use global variable to store data, some use file storage
|
|
38
|
+
this.isFileStorage = true;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
/**
|
|
42
|
+
* Puts any data to storage (file or global variable).
|
|
43
|
+
* If file: stores data as text, if global variable – stores as array of data.
|
|
44
|
+
* @param {'log' | 'artifact' | 'keyvalue'} dataType
|
|
45
|
+
* @param {*} data anything you want to store (string, object, array, etc)
|
|
46
|
+
* @param {*} context could be testId or any context (test name, suite name, including their IDs etc)
|
|
47
|
+
* suite name + test name is used by default
|
|
48
|
+
* @returns
|
|
49
|
+
*/
|
|
50
|
+
putData(dataType, data, context = null) {
|
|
51
|
+
if (!dataType || !data) return;
|
|
52
|
+
|
|
53
|
+
context = context || this.context || testRunnerHelper.getNameOfCurrentlyRunningTest();
|
|
54
|
+
if (!context) {
|
|
55
|
+
debug(`No context provided for "${dataType}" data:`, data);
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
const contextHash = stringToMD5Hash(context);
|
|
59
|
+
|
|
60
|
+
if (this.isFileStorage) {
|
|
61
|
+
const dataDirPath = path.join(TESTOMAT_TMP_STORAGE_DIR, dataType);
|
|
62
|
+
fileSystem.createDir(dataDirPath);
|
|
63
|
+
this.#putDataToFile(dataType, data, contextHash);
|
|
64
|
+
} else {
|
|
65
|
+
this.#putDataToGlobalVar(dataType, data, contextHash);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
/**
|
|
70
|
+
* Returns data, stored for specific test/context (or data which was stored without test id specified).
|
|
71
|
+
* This method will get data from global variable and/or from from file (previosly saved with put method).
|
|
72
|
+
*
|
|
73
|
+
* @param {'log' | 'artifact' | 'keyvalue'} dataType
|
|
74
|
+
* @param {string} context
|
|
75
|
+
* @returns {any []} array of data (any type), null (if no data found for context) or string (if data type is log)
|
|
76
|
+
*/
|
|
77
|
+
getData(dataType, context) {
|
|
78
|
+
// TODO: think if it could be useful
|
|
79
|
+
// context = context || this.context || testRunnerHelper.getNameOfCurrentlyRunningTest();
|
|
80
|
+
|
|
81
|
+
if (!context) {
|
|
82
|
+
debug(`Trying to get "${dataType}" data without context`);
|
|
83
|
+
return null;
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
const contextHash = stringToMD5Hash(context);
|
|
87
|
+
|
|
88
|
+
let testDataFromFile = [];
|
|
89
|
+
let testDataFromGlobalVar = [];
|
|
90
|
+
|
|
91
|
+
if (global?.testomatioDataStore) {
|
|
92
|
+
testDataFromGlobalVar = this.#getDataFromGlobalVar(dataType, contextHash);
|
|
93
|
+
if (testDataFromGlobalVar) {
|
|
94
|
+
if (testDataFromGlobalVar.length) return testDataFromGlobalVar;
|
|
95
|
+
}
|
|
96
|
+
// don't return nothing if no data in global variable
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
testDataFromFile = this.#getDataFromFile(dataType, contextHash);
|
|
100
|
+
|
|
101
|
+
if (testDataFromFile.length) {
|
|
102
|
+
return testDataFromFile;
|
|
103
|
+
}
|
|
104
|
+
debug(`No "${dataType}" data for context "${contextHash}" in both file and global variable`);
|
|
105
|
+
|
|
106
|
+
// in case no data found for context
|
|
107
|
+
return null;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
/**
|
|
111
|
+
* @param {'log' | 'artifact' | 'keyvalue'} dataType
|
|
112
|
+
* @param {string} context
|
|
113
|
+
* @returns aray of data (any type)
|
|
114
|
+
*/
|
|
115
|
+
#getDataFromGlobalVar(dataType, context) {
|
|
116
|
+
try {
|
|
117
|
+
if (global?.testomatioDataStore[dataType]) {
|
|
118
|
+
const testData = global.testomatioDataStore[dataType][context];
|
|
119
|
+
if (testData) debug(`"${dataType}" data for constext "${context}":`, testData.join(', '));
|
|
120
|
+
return testData || [];
|
|
121
|
+
}
|
|
122
|
+
// debug(`No ${this.dataType} data for context ${context} in <global> storage`);
|
|
123
|
+
return [];
|
|
124
|
+
} catch (e) {
|
|
125
|
+
// there could be no data, ignore
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
/**
|
|
130
|
+
* @param {'log' | 'artifact' | 'keyvalue'} dataType
|
|
131
|
+
* @param {*} context
|
|
132
|
+
* @returns array of data (any type)
|
|
133
|
+
*/
|
|
134
|
+
#getDataFromFile(dataType, context) {
|
|
135
|
+
const dataDirPath = path.join(TESTOMAT_TMP_STORAGE_DIR, dataType);
|
|
136
|
+
try {
|
|
137
|
+
const filepath = join(dataDirPath, `${dataType}_${context}`);
|
|
138
|
+
if (fs.existsSync(filepath)) {
|
|
139
|
+
const testDataAsText = fs.readFileSync(filepath, 'utf-8');
|
|
140
|
+
if (testDataAsText) debug(`"${dataType}" data for context "${context}":`, testDataAsText);
|
|
141
|
+
const testDataArr = testDataAsText?.split(os.EOL) || [];
|
|
142
|
+
return testDataArr;
|
|
143
|
+
}
|
|
144
|
+
// debug(`No ${this.dataType} data for ${context} in <file> storage`);
|
|
145
|
+
return [];
|
|
146
|
+
} catch (e) {
|
|
147
|
+
// there could be no data, ignore
|
|
148
|
+
}
|
|
149
|
+
return [];
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
/**
|
|
153
|
+
* Puts data to global variable. Unlike the file storage, stores data in array (file storage just append as string).
|
|
154
|
+
* @param {'log' | 'artifact' | 'keyvalue'} dataType
|
|
155
|
+
* @param {*} data
|
|
156
|
+
* @param {*} context
|
|
157
|
+
*/
|
|
158
|
+
#putDataToGlobalVar(dataType, data, context) {
|
|
159
|
+
debug('Saving data to global variable for ', context, ':', data);
|
|
160
|
+
if (!global.testomatioDataStore) global.testomatioDataStore = {};
|
|
161
|
+
if (!global.testomatioDataStore?.[dataType]) global.testomatioDataStore[dataType] = {};
|
|
162
|
+
|
|
163
|
+
if (!global.testomatioDataStore?.[dataType][context]) global.testomatioDataStore[dataType][context] = [];
|
|
164
|
+
global.testomatioDataStore[dataType][context].push(data);
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
/**
|
|
168
|
+
* Puts data to file. Unlike the global variable storage, stores data as string
|
|
169
|
+
* @param {'log' | 'artifact' | 'keyvalue'} dataType
|
|
170
|
+
* @param {*} data
|
|
171
|
+
* @param {string} context
|
|
172
|
+
* @returns
|
|
173
|
+
*/
|
|
174
|
+
#putDataToFile(dataType, data, context) {
|
|
175
|
+
const dataDirPath = path.join(TESTOMAT_TMP_STORAGE_DIR, dataType);
|
|
176
|
+
if (typeof data !== 'string') data = JSON.stringify(data);
|
|
177
|
+
const filename = `${dataType}_${context}`;
|
|
178
|
+
const filepath = join(dataDirPath, filename);
|
|
179
|
+
if (!fs.existsSync(dataDirPath)) fileSystem.createDir(dataDirPath);
|
|
180
|
+
debug(`Saving data to file for context "${context}" to ${filepath}. Data: ${JSON.stringify(data)}`);
|
|
181
|
+
|
|
182
|
+
// append new line if file already exists (in this case its definitely includes some data)
|
|
183
|
+
if (fs.existsSync(filepath)) {
|
|
184
|
+
fs.appendFileSync(filepath, os.EOL + data, 'utf-8');
|
|
185
|
+
} else {
|
|
186
|
+
fs.writeFileSync(filepath, data, 'utf-8');
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
function stringToMD5Hash(str) {
|
|
192
|
+
const md5 = crypto.createHash('md5');
|
|
193
|
+
md5.update(str);
|
|
194
|
+
const hash = md5.digest('hex');
|
|
195
|
+
|
|
196
|
+
return hash;
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
module.exports.dataStorage = DataStorage.getInstance();
|
|
200
|
+
module.exports.stringToMD5Hash = stringToMD5Hash;
|
|
201
|
+
|
|
202
|
+
// TODO: consider using fs promises instead of writeSync/appendFileSync to
|
|
203
|
+
// prevent blocking and improve performance (probably queue usage will be required)
|
package/lib/fileUploader.js
CHANGED
|
@@ -3,10 +3,15 @@ const { S3 } = require('@aws-sdk/client-s3');
|
|
|
3
3
|
const { Upload } = require('@aws-sdk/lib-storage');
|
|
4
4
|
|
|
5
5
|
const fs = require('fs');
|
|
6
|
+
const util = require('util');
|
|
6
7
|
const path = require('path');
|
|
8
|
+
const promiseRetry = require('promise-retry');
|
|
9
|
+
|
|
10
|
+
const readFile = util.promisify(fs.readFile);
|
|
11
|
+
const stat = util.promisify(fs.stat);
|
|
7
12
|
const chalk = require('chalk');
|
|
8
13
|
const { randomUUID } = require('crypto');
|
|
9
|
-
|
|
14
|
+
|
|
10
15
|
const { APP_PREFIX } = require('./constants');
|
|
11
16
|
|
|
12
17
|
const keys = [
|
|
@@ -37,8 +42,12 @@ function getConfig() {
|
|
|
37
42
|
}
|
|
38
43
|
|
|
39
44
|
function getMaskedConfig() {
|
|
40
|
-
return Object.fromEntries(
|
|
41
|
-
.map(([key, value]) => [
|
|
45
|
+
return Object.fromEntries(
|
|
46
|
+
Object.entries(getConfig()).map(([key, value]) => [
|
|
47
|
+
key,
|
|
48
|
+
key === 'S3_SECRET_ACCESS_KEY' || key === 'S3_ACCESS_KEY_ID' ? '***' : value,
|
|
49
|
+
]),
|
|
50
|
+
);
|
|
42
51
|
}
|
|
43
52
|
|
|
44
53
|
let isEnabled;
|
|
@@ -73,7 +82,7 @@ const _getS3Config = () => {
|
|
|
73
82
|
accessKeyId: S3_ACCESS_KEY_ID,
|
|
74
83
|
secretAccessKey: S3_SECRET_ACCESS_KEY,
|
|
75
84
|
s3ForcePathStyle: S3_FORCE_PATH_STYLE,
|
|
76
|
-
}
|
|
85
|
+
},
|
|
77
86
|
};
|
|
78
87
|
|
|
79
88
|
if (S3_ENDPOINT) {
|
|
@@ -81,7 +90,7 @@ const _getS3Config = () => {
|
|
|
81
90
|
}
|
|
82
91
|
|
|
83
92
|
return cfg;
|
|
84
|
-
}
|
|
93
|
+
};
|
|
85
94
|
|
|
86
95
|
const uploadUsingS3 = async (filePath, runId) => {
|
|
87
96
|
let ContentType;
|
|
@@ -93,48 +102,62 @@ const uploadUsingS3 = async (filePath, runId) => {
|
|
|
93
102
|
Key = filePath.name;
|
|
94
103
|
}
|
|
95
104
|
|
|
96
|
-
|
|
97
|
-
console.error(chalk.yellow(`Artifacts file ${filePath} does not exist. Skipping...`));
|
|
98
|
-
return;
|
|
99
|
-
}
|
|
105
|
+
const { TESTOMATIO_PRIVATE_ARTIFACTS, S3_BUCKET } = getConfig();
|
|
100
106
|
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
107
|
+
try {
|
|
108
|
+
debug('S3 config', getMaskedConfig());
|
|
109
|
+
debug('Started upload', filePath, 'to ', S3_BUCKET);
|
|
104
110
|
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
const fileData = fs.readFileSync(filePath);
|
|
111
|
+
// Verification that the file was actually created: 20 attempts of 0.5 second => 10sec
|
|
112
|
+
const isFileExist = await checkFileExists(filePath, 20, 500);
|
|
109
113
|
|
|
110
|
-
|
|
111
|
-
|
|
114
|
+
if (!isFileExist) {
|
|
115
|
+
console.error(chalk.yellow(`Artifacts file ${filePath} does not exist. Skipping...`));
|
|
116
|
+
return;
|
|
117
|
+
}
|
|
112
118
|
|
|
113
|
-
|
|
119
|
+
debug('File: ', filePath, ' exists');
|
|
114
120
|
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
Key
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
121
|
+
const fileData = await readFile(filePath);
|
|
122
|
+
|
|
123
|
+
Key = `${runId}/${randomUUID()}-${Key || path.basename(filePath)}`;
|
|
124
|
+
|
|
125
|
+
const ACL = TESTOMATIO_PRIVATE_ARTIFACTS ? 'private' : 'public-read';
|
|
126
|
+
|
|
127
|
+
if (!S3_BUCKET || !fileData) {
|
|
128
|
+
console.log(
|
|
129
|
+
APP_PREFIX,
|
|
130
|
+
chalk.bold.red(`Failed uploading '${Key}'. Please check S3 credentials`),
|
|
131
|
+
getMaskedConfig(),
|
|
132
|
+
);
|
|
133
|
+
return;
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
const s3 = new S3(_getS3Config());
|
|
137
|
+
|
|
138
|
+
const params = {
|
|
139
|
+
Bucket: S3_BUCKET,
|
|
140
|
+
Key,
|
|
141
|
+
Body: fileData,
|
|
142
|
+
ContentType,
|
|
143
|
+
ACL,
|
|
144
|
+
};
|
|
122
145
|
|
|
123
|
-
try {
|
|
124
146
|
const out = new Upload({
|
|
125
147
|
client: s3,
|
|
126
|
-
params
|
|
148
|
+
params,
|
|
127
149
|
});
|
|
128
150
|
|
|
129
|
-
await out
|
|
130
|
-
debug('Uploaded', out.singleUploadResult.Location)
|
|
151
|
+
const link = await getS3LocationLink(out);
|
|
131
152
|
|
|
132
|
-
|
|
153
|
+
debug(`Succesfully uploaded ${filePath} => ${S3_BUCKET}/${Key} | URL: ${link}`);
|
|
154
|
+
|
|
155
|
+
return link;
|
|
133
156
|
} catch (e) {
|
|
134
|
-
|
|
135
|
-
console.log(APP_PREFIX, chalk.red(`Failed uploading '${Key}'. Please check S3 credentials`), getMaskedConfig());
|
|
157
|
+
debug('S3 file uploading error: ', e);
|
|
136
158
|
|
|
137
159
|
console.log(APP_PREFIX, `To ${chalk.bold('disable')} artifact uploads set: TESTOMATIO_DISABLE_ARTIFACTS=1`);
|
|
160
|
+
|
|
138
161
|
if (!TESTOMATIO_PRIVATE_ARTIFACTS) {
|
|
139
162
|
console.log(APP_PREFIX, `To enable ${chalk.bold('PRIVATE')} uploads set: TESTOMATIO_PRIVATE_ARTIFACTS=1`);
|
|
140
163
|
} else {
|
|
@@ -144,20 +167,30 @@ const fileData = fs.readFileSync(filePath);
|
|
|
144
167
|
);
|
|
145
168
|
}
|
|
146
169
|
console.log(APP_PREFIX, '---------------');
|
|
147
|
-
}
|
|
170
|
+
}
|
|
148
171
|
};
|
|
149
172
|
|
|
150
173
|
const uploadUsingS3AsBuffer = async (buffer, fileName, runId) => {
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
S3_REGION, S3_ACCESS_KEY_ID, S3_SECRET_ACCESS_KEY, S3_ENDPOINT, TESTOMATIO_PRIVATE_ARTIFACTS, S3_BUCKET
|
|
154
|
-
} = getConfig();
|
|
174
|
+
const { S3_REGION, S3_ACCESS_KEY_ID, S3_SECRET_ACCESS_KEY, S3_ENDPOINT, TESTOMATIO_PRIVATE_ARTIFACTS, S3_BUCKET } =
|
|
175
|
+
getConfig();
|
|
155
176
|
|
|
156
177
|
const ACL = TESTOMATIO_PRIVATE_ARTIFACTS ? 'private' : 'public-read';
|
|
157
178
|
|
|
158
179
|
const fileExtension = _getFileExtBase64(buffer.toString('base64'));
|
|
159
180
|
const Key = `${runId}/${fileName}${fileExtension}`;
|
|
160
181
|
|
|
182
|
+
if (!S3_BUCKET || !buffer) {
|
|
183
|
+
console.log(APP_PREFIX, chalk.bold.red(`Failed uploading '${Key}'. Please check S3 credentials`), {
|
|
184
|
+
accessKeyId: S3_ACCESS_KEY_ID,
|
|
185
|
+
secretAccessKey: S3_SECRET_ACCESS_KEY ? '**** (hidden) ***' : '(empty)',
|
|
186
|
+
region: S3_REGION,
|
|
187
|
+
bucket: S3_BUCKET,
|
|
188
|
+
acl: ACL,
|
|
189
|
+
endpoint: S3_ENDPOINT,
|
|
190
|
+
});
|
|
191
|
+
return;
|
|
192
|
+
}
|
|
193
|
+
|
|
161
194
|
const s3 = new S3(_getS3Config());
|
|
162
195
|
|
|
163
196
|
try {
|
|
@@ -169,22 +202,15 @@ const uploadUsingS3AsBuffer = async (buffer, fileName, runId) => {
|
|
|
169
202
|
Key,
|
|
170
203
|
Body: buffer,
|
|
171
204
|
ACL,
|
|
172
|
-
}
|
|
205
|
+
},
|
|
173
206
|
});
|
|
174
|
-
await out.done();
|
|
175
207
|
|
|
176
|
-
return out
|
|
208
|
+
return await getS3LocationLink(out);
|
|
177
209
|
} catch (e) {
|
|
178
|
-
|
|
179
|
-
accessKeyId: S3_ACCESS_KEY_ID,
|
|
180
|
-
secretAccessKey: S3_SECRET_ACCESS_KEY ? '**** (hidden) ***' : '(empty)',
|
|
181
|
-
region: S3_REGION,
|
|
182
|
-
bucket: S3_BUCKET,
|
|
183
|
-
acl: ACL,
|
|
184
|
-
endpoint: S3_ENDPOINT,
|
|
185
|
-
});
|
|
210
|
+
debug('S3 buffer uploading error: ', e);
|
|
186
211
|
|
|
187
212
|
console.log(APP_PREFIX, `To ${chalk.bold('disable')} artifact uploads set: TESTOMATIO_DISABLE_ARTIFACTS=1`);
|
|
213
|
+
|
|
188
214
|
if (!TESTOMATIO_PRIVATE_ARTIFACTS) {
|
|
189
215
|
console.log(APP_PREFIX, `To enable ${chalk.bold('PRIVATE')} uploads set: TESTOMATIO_PRIVATE_ARTIFACTS=1`);
|
|
190
216
|
} else {
|
|
@@ -203,7 +229,9 @@ const uploadFileByPath = async (filePath, runId) => {
|
|
|
203
229
|
return uploadUsingS3(filePath, runId);
|
|
204
230
|
}
|
|
205
231
|
} catch (e) {
|
|
206
|
-
|
|
232
|
+
debug(e);
|
|
233
|
+
|
|
234
|
+
console.error(chalk.red('Error occurred while uploading artifacts! '), e);
|
|
207
235
|
}
|
|
208
236
|
};
|
|
209
237
|
|
|
@@ -213,13 +241,60 @@ const uploadFileAsBuffer = async (buffer, fileName, runId) => {
|
|
|
213
241
|
return uploadUsingS3AsBuffer(buffer, fileName, runId);
|
|
214
242
|
}
|
|
215
243
|
} catch (e) {
|
|
216
|
-
|
|
244
|
+
debug(e);
|
|
245
|
+
|
|
246
|
+
console.error(chalk.red('Error occurred while uploading artifacts! '), e);
|
|
217
247
|
}
|
|
218
248
|
};
|
|
219
249
|
|
|
250
|
+
const checkFileExists = async (filePath, attempts = 5, intervalMs = 500) => {
|
|
251
|
+
const checkFile = async () => {
|
|
252
|
+
const fileStats = await stat(filePath);
|
|
253
|
+
if (fileStats.isFile()) {
|
|
254
|
+
return true;
|
|
255
|
+
}
|
|
256
|
+
|
|
257
|
+
throw new Error('File not found');
|
|
258
|
+
};
|
|
259
|
+
|
|
260
|
+
try {
|
|
261
|
+
await promiseRetry(
|
|
262
|
+
{
|
|
263
|
+
retries: attempts,
|
|
264
|
+
minTimeout: intervalMs,
|
|
265
|
+
},
|
|
266
|
+
checkFile,
|
|
267
|
+
);
|
|
268
|
+
|
|
269
|
+
return true;
|
|
270
|
+
} catch (err) {
|
|
271
|
+
console.error(chalk.yellow(`File ${filePath} was not found or did not have time to be generated...`));
|
|
272
|
+
|
|
273
|
+
return false;
|
|
274
|
+
}
|
|
275
|
+
};
|
|
276
|
+
|
|
277
|
+
const getS3LocationLink = async out => {
|
|
278
|
+
const response = await out.done();
|
|
279
|
+
|
|
280
|
+
let s3Location = response?.Location;
|
|
281
|
+
|
|
282
|
+
if (!s3Location) {
|
|
283
|
+
// TODO: out: a fallback case - remove after deeper testing
|
|
284
|
+
s3Location = out?.singleUploadResult?.Location;
|
|
285
|
+
debug('Uploaded singleUploadResult.Location', s3Location);
|
|
286
|
+
|
|
287
|
+
if (!s3Location) {
|
|
288
|
+
throw new Error("Problems getting the S3 artifact's link. Please check S3 permissions!");
|
|
289
|
+
}
|
|
290
|
+
}
|
|
291
|
+
|
|
292
|
+
return s3Location;
|
|
293
|
+
};
|
|
294
|
+
|
|
220
295
|
module.exports = {
|
|
221
|
-
uploadFileByPath
|
|
222
|
-
uploadFileAsBuffer
|
|
296
|
+
uploadFileByPath,
|
|
297
|
+
uploadFileAsBuffer,
|
|
223
298
|
isArtifactsEnabled,
|
|
224
299
|
resetConfig,
|
|
225
300
|
};
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
const Adapter = require('./adapter');
|
|
2
2
|
|
|
3
3
|
class CSharpAdapter extends Adapter {
|
|
4
|
-
|
|
5
4
|
formatTest(t) {
|
|
6
5
|
const title = t.title.replace(/\(.*?\)/, '').trim();
|
|
7
6
|
const example = t.title.match(/\((.*?)\)/);
|
|
8
|
-
if (example) t.example = { ...example[1].split(',')};
|
|
9
|
-
const suite = t.suite_title.split('.')
|
|
7
|
+
if (example) t.example = { ...example[1].split(',') };
|
|
8
|
+
const suite = t.suite_title.split('.');
|
|
10
9
|
t.suite_title = suite.pop();
|
|
11
10
|
t.file = suite.join('/');
|
|
12
11
|
t.title = title.trim();
|
|
@@ -14,4 +13,4 @@ class CSharpAdapter extends Adapter {
|
|
|
14
13
|
}
|
|
15
14
|
}
|
|
16
15
|
|
|
17
|
-
module.exports = CSharpAdapter;
|
|
16
|
+
module.exports = CSharpAdapter;
|
|
@@ -6,8 +6,6 @@ const RubyAdapter = require('./ruby');
|
|
|
6
6
|
const CSharpAdapter = require('./csharp');
|
|
7
7
|
|
|
8
8
|
function AdapterFactory(lang, opts) {
|
|
9
|
-
if (!lang) return new Adapter(opts);
|
|
10
|
-
|
|
11
9
|
if (lang === 'java') {
|
|
12
10
|
return new JavaAdapter(opts);
|
|
13
11
|
}
|
|
@@ -23,6 +21,8 @@ function AdapterFactory(lang, opts) {
|
|
|
23
21
|
if (lang === 'c#' || lang === 'csharp') {
|
|
24
22
|
return new CSharpAdapter(opts);
|
|
25
23
|
}
|
|
24
|
+
|
|
25
|
+
return new Adapter(opts);
|
|
26
26
|
}
|
|
27
27
|
|
|
28
|
-
module.exports = AdapterFactory;
|
|
28
|
+
module.exports = AdapterFactory;
|
|
@@ -2,39 +2,57 @@ const path = require('path');
|
|
|
2
2
|
const Adapter = require('./adapter');
|
|
3
3
|
|
|
4
4
|
class JavaAdapter extends Adapter {
|
|
5
|
-
|
|
6
5
|
getFilePath(t) {
|
|
7
|
-
const fileName = namespaceToFileName(t.suite_title)
|
|
6
|
+
const fileName = namespaceToFileName(t.suite_title);
|
|
8
7
|
return this.opts.javaTests + path.sep + fileName;
|
|
9
8
|
}
|
|
10
9
|
|
|
11
10
|
formatTest(t) {
|
|
12
|
-
const fileParts = t.suite_title.split('.')
|
|
13
|
-
const example = t.title.match(/\[(.*)\]/)?.[1];
|
|
14
|
-
if (example) t.example = { "#": example }
|
|
11
|
+
const fileParts = t.suite_title.split('.');
|
|
15
12
|
|
|
16
13
|
t.file = namespaceToFileName(t.suite_title);
|
|
17
14
|
t.title = t.title.split('(')[0];
|
|
18
|
-
|
|
15
|
+
|
|
16
|
+
// detect params
|
|
17
|
+
const paramMatches = t.title.match(/\[(.*?)\]/g);
|
|
18
|
+
|
|
19
|
+
if (paramMatches) {
|
|
20
|
+
const params = paramMatches.map((_match, index) => `param${index + 1}`);
|
|
21
|
+
if (params.length === 1) params[0] = 'param';
|
|
22
|
+
let paramIndex = 0;
|
|
23
|
+
|
|
24
|
+
t.title = t.title.replace(/: \[(.*?)\]/g, () => {
|
|
25
|
+
if (params.length < 2) return `\${param}`;
|
|
26
|
+
const paramName = params[paramIndex] || `param${paramIndex + 1}`;
|
|
27
|
+
paramIndex++;
|
|
28
|
+
return `\${${paramName}}`;
|
|
29
|
+
});
|
|
30
|
+
const example = {};
|
|
31
|
+
paramMatches.forEach((match, index) => {
|
|
32
|
+
example[params[index]] = match.replace(/[[\]]/g, '');
|
|
33
|
+
});
|
|
34
|
+
t.example = example;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
t.suite_title = fileParts[fileParts.length - 1].replace(/\$/g, ' | ');
|
|
19
38
|
return t;
|
|
20
39
|
}
|
|
21
40
|
|
|
22
|
-
formatStack(t) {
|
|
23
|
-
|
|
41
|
+
// formatStack(t) {
|
|
42
|
+
// const stack = super.formatStack(t);
|
|
24
43
|
|
|
25
|
-
|
|
44
|
+
// const file = t.suite_title.split('.');
|
|
26
45
|
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
}
|
|
46
|
+
// const fileLine = `at .*${file[file.length - 1]}\.java:(\\d+)` // eslint-disable-line no-useless-escape
|
|
47
|
+
// const regexp = new RegExp(fileLine,"g")
|
|
48
|
+
// return stack.replace(regexp, `${this.opts.javaTests}${path.sep}${namespaceToFileName(t.suite_title)}:$1:`);
|
|
49
|
+
// }
|
|
31
50
|
}
|
|
32
51
|
|
|
33
52
|
function namespaceToFileName(fileName) {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
53
|
+
const fileParts = fileName.split('.');
|
|
54
|
+
fileParts[fileParts.length - 1] = fileParts[fileParts.length - 1]?.replace(/\$.*/, '');
|
|
55
|
+
return `${fileParts.join(path.sep)}.java`;
|
|
38
56
|
}
|
|
39
57
|
|
|
40
58
|
module.exports = JavaAdapter;
|
|
@@ -3,12 +3,11 @@ const path = require('path');
|
|
|
3
3
|
const Adapter = require('./adapter');
|
|
4
4
|
|
|
5
5
|
class JavaScriptAdapter extends Adapter {
|
|
6
|
-
|
|
7
6
|
formatStack(t) {
|
|
8
7
|
let stack = super.formatStack(t);
|
|
9
8
|
|
|
10
9
|
try {
|
|
11
|
-
const error = new Error(stack.split('\n')[0])
|
|
10
|
+
const error = new Error(stack.split('\n')[0]);
|
|
12
11
|
error.stack = stack;
|
|
13
12
|
const record = createCallsiteRecord({
|
|
14
13
|
forError: error,
|
|
@@ -3,7 +3,6 @@ const fs = require('fs');
|
|
|
3
3
|
const Adapter = require('./adapter');
|
|
4
4
|
|
|
5
5
|
class PythonAdapter extends Adapter {
|
|
6
|
-
|
|
7
6
|
getFilePath(t) {
|
|
8
7
|
let fileName = namespaceToFileName(t.suite_title, { checkFile: true });
|
|
9
8
|
if (!fileName) fileName = namespaceToFileName(t.suite_title, { checkFile: false });
|
|
@@ -11,34 +10,33 @@ class PythonAdapter extends Adapter {
|
|
|
11
10
|
}
|
|
12
11
|
|
|
13
12
|
formatTest(t) {
|
|
14
|
-
const fileParts = t.suite_title.split('.')
|
|
13
|
+
const fileParts = t.suite_title.split('.');
|
|
15
14
|
const example = t.title.match(/\[(.*)\]/)?.[1];
|
|
16
|
-
if (example) t.example = {
|
|
15
|
+
if (example) t.example = { '#': example };
|
|
17
16
|
|
|
18
17
|
t.file = namespaceToFileName(t.suite_title);
|
|
19
18
|
t.title = t.title.split('[')[0];
|
|
20
|
-
t.suite_title = fileParts[fileParts.length - 1].replace(/\$/g, ' | ')
|
|
19
|
+
t.suite_title = fileParts[fileParts.length - 1].replace(/\$/g, ' | ');
|
|
21
20
|
return t;
|
|
22
21
|
}
|
|
23
22
|
|
|
24
23
|
formatMessage(t) {
|
|
25
24
|
return t.message.split(' ')[0];
|
|
26
25
|
}
|
|
27
|
-
|
|
28
26
|
}
|
|
29
27
|
|
|
30
28
|
function namespaceToFileName(fileName, opts = {}) {
|
|
31
|
-
|
|
29
|
+
const fileParts = fileName.split('.');
|
|
32
30
|
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
}
|
|
39
|
-
fileParts.pop();
|
|
31
|
+
while (fileParts.length > 0) {
|
|
32
|
+
const file = `${fileParts.join(path.sep)}.py`;
|
|
33
|
+
if (!opts.checkFile) return file;
|
|
34
|
+
if (fs.existsSync(`${fileParts.join(path.sep)}.py`)) {
|
|
35
|
+
return file;
|
|
40
36
|
}
|
|
41
|
-
|
|
37
|
+
fileParts.pop();
|
|
38
|
+
}
|
|
39
|
+
return null;
|
|
42
40
|
}
|
|
43
41
|
|
|
44
42
|
module.exports = PythonAdapter;
|