Skip to content

Commit 7bb2313

Browse files
skadefroskadefro
committed
fix tests
1 parent 64a4f14 commit 7bb2313

14 files changed

Lines changed: 64 additions & 46 deletions

‎OpenFlow/src/Audit.ts‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export type tokenType = "local" | "jwtsignin" | "samltoken" | "tokenissued" | "w
77
export type loginProvider = "saml" | "google" | "local" | "websocket";
88
export type clientType = "browser" | "openrpa" | "nodered" | "webapp" | "openflow" | "powershell" | "mobileapp" | "samlverify" | "googleverify" | "aiotmobileapp" | "aiotwebapp";
99
export class Audit {
10-
public static LoginSuccess(user: TokenUser, type: tokenType, provider: loginProvider, remoteip: string, clientagent: clientType, clientversion: string, parent: Span) {
10+
public static async LoginSuccess(user: TokenUser, type: tokenType, provider: loginProvider, remoteip: string, clientagent: clientType, clientversion: string, parent: Span): Promise<void> {
1111
const log: Singin = new Singin();
1212
Base.addRight(log, user._id, user.name, [Rights.read, Rights.update, Rights.invoke]);
1313
log.remoteip = remoteip;
@@ -19,10 +19,9 @@ export class Audit {
1919
log.username = user.username;
2020
log.clientagent = clientagent;
2121
log.clientversion = clientversion;
22-
Config.db.InsertOne(log, "audit", 0, false, Crypt.rootToken(), parent)
23-
.catch((error) => console.error("failed InsertOne in LoginSuccess: " + error));
22+
await Config.db.InsertOne(log, "audit", 0, false, Crypt.rootToken(), parent);
2423
}
25-
public static ImpersonateSuccess(user: TokenUser, impostor: TokenUser, clientagent: clientType, clientversion: string, parent: Span) {
24+
public static async ImpersonateSuccess(user: TokenUser, impostor: TokenUser, clientagent: clientType, clientversion: string, parent: Span): Promise<void> {
2625
const log: Singin = new Singin();
2726
Base.addRight(log, user._id, user.name, [Rights.read]);
2827
Base.addRight(log, impostor._id, impostor.name, [Rights.read]);
@@ -36,10 +35,9 @@ export class Audit {
3635
log.impostorusername = impostor.username;
3736
log.clientagent = clientagent;
3837
log.clientversion = clientversion;
39-
Config.db.InsertOne(log, "audit", 0, false, Crypt.rootToken(), parent)
40-
.catch((error) => console.error("failed InsertOne in ImpersonateSuccess: " + error));
38+
Config.db.InsertOne(log, "audit", 0, false, Crypt.rootToken(), parent);
4139
}
42-
public static ImpersonateFailed(user: TokenUser, impostor: TokenUser, clientagent: clientType, clientversion: string, parent: Span) {
40+
public static async ImpersonateFailed(user: TokenUser, impostor: TokenUser, clientagent: clientType, clientversion: string, parent: Span): Promise<void> {
4341
const log: Singin = new Singin();
4442
Base.addRight(log, user._id, user.name, [Rights.read]);
4543
Base.addRight(log, impostor._id, impostor.name, [Rights.read]);
@@ -52,10 +50,9 @@ export class Audit {
5250
log.impostorname = impostor.name;
5351
log.clientagent = clientagent;
5452
log.clientversion = clientversion;
55-
Config.db.InsertOne(log, "audit", 0, false, Crypt.rootToken(), parent)
56-
.catch((error) => console.error("failed InsertOne in ImpersonateFailed: " + error));
53+
Config.db.InsertOne(log, "audit", 0, false, Crypt.rootToken(), parent);
5754
}
58-
public static LoginFailed(username: string, type: tokenType, provider: loginProvider, remoteip: string, clientagent: clientType, clientversion: string, parent: Span) {
55+
public static async LoginFailed(username: string, type: tokenType, provider: loginProvider, remoteip: string, clientagent: clientType, clientversion: string, parent: Span): Promise<void> {
5956
const log: Singin = new Singin();
6057
log.remoteip = remoteip;
6158
log.success = false;
@@ -64,10 +61,9 @@ export class Audit {
6461
log.username = username;
6562
log.clientagent = clientagent;
6663
log.clientversion = clientversion;
67-
Config.db.InsertOne(log, "audit", 0, false, Crypt.rootToken(), parent)
68-
.catch((error) => console.error("failed InsertOne in LoginFailed: " + error));
64+
Config.db.InsertOne(log, "audit", 0, false, Crypt.rootToken(), parent);
6965
}
70-
public static NoderedAction(user: TokenUser, success: boolean, name: string, type: string, image: string, instancename: string, parent: Span) {
66+
public static async NoderedAction(user: TokenUser, success: boolean, name: string, type: string, image: string, instancename: string, parent: Span): Promise<void> {
7167
const log: Nodered = new Nodered();
7268
Base.addRight(log, user._id, user.name, [Rights.read]);
7369
log.success = success;
@@ -85,8 +81,7 @@ export class Audit {
8581

8682
}
8783
if (!NoderedUtil.IsNullEmpty(instancename)) log.name = instancename;
88-
Config.db.InsertOne(log, "audit", 0, false, Crypt.rootToken(), parent)
89-
.catch((error) => console.error("failed InsertOne in LoginFailed: " + error));
84+
await Config.db.InsertOne(log, "audit", 0, false, Crypt.rootToken(), parent);
9085
}
9186
}
9287
export class Singin extends Base {

‎test/Audit.test.ts‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
const path = require("path");
33
const env = path.join(process.cwd(), 'config', '.env');
44
require("dotenv").config({ path: env }); // , debug: false
5-
import { suite, test } from '@testdeck/mocha';
5+
import { suite, test, timeout } from '@testdeck/mocha';
66
import { Config } from "../OpenFlow/src/Config";
77
import { DatabaseConnection } from '../OpenFlow/src/DatabaseConnection';
88
import assert = require('assert');
@@ -16,7 +16,9 @@ import { Auth } from '../OpenFlow/src/Auth';
1616
@suite class audit_test {
1717
private rootToken: string;
1818
private testUser: User;
19+
@timeout(10000)
1920
async before() {
21+
Config.workitem_queue_monitoring_enabled = false;
2022
Config.disablelogging();
2123
Logger.configure(true, false);
2224
Config.db = new DatabaseConnection(Config.mongodb_url, Config.mongodb_db, false);
@@ -26,20 +28,19 @@ import { Auth } from '../OpenFlow/src/Auth';
2628
}
2729
async after() {
2830
await Config.db.shutdown();
29-
Logger.otel.shutdown();
31+
await Logger.otel.shutdown();
3032
Auth.shutdown();
31-
Config.log_amqp = true;
3233
// wtf.dump()
3334
}
3435
@test async 'reload'() {
3536
const tuser: TokenUser = TokenUser.From(this.testUser);
3637
const troot: TokenUser = TokenUser.From(Crypt.rootUser());
37-
Audit.LoginSuccess(tuser, "local", "local", "127.0.0.1", "openflow", Config.version, null);
38-
Audit.LoginFailed("testuser", "local", "local", "127.0.0.1", "openflow", Config.version, null);
39-
Audit.ImpersonateSuccess(tuser, troot, "openflow", Config.version, null);
40-
Audit.ImpersonateFailed(tuser, troot, "openflow", Config.version, null);
41-
Audit.NoderedAction(tuser, true, "testuser", "createdeployment", "openiap/nodered", "testuser", null);
42-
Audit.NoderedAction(tuser, true, "testuser", "deletedeployment", "openiap/nodered:latest", "testuser", null);
38+
await Audit.LoginSuccess(tuser, "local", "local", "127.0.0.1", "openflow", Config.version, null);
39+
await Audit.LoginFailed("testuser", "local", "local", "127.0.0.1", "openflow", Config.version, null);
40+
await Audit.ImpersonateSuccess(tuser, troot, "openflow", Config.version, null);
41+
await Audit.ImpersonateFailed(tuser, troot, "openflow", Config.version, null);
42+
await Audit.NoderedAction(tuser, true, "testuser", "createdeployment", "openiap/nodered", "testuser", null);
43+
await Audit.NoderedAction(tuser, true, "testuser", "deletedeployment", "openiap/nodered:latest", "testuser", null);
4344
await new Promise(resolve => { setTimeout(resolve, 1000) })
4445
}
4546

‎test/Auth.test.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const path = require("path");
22
const env = path.join(process.cwd(), 'config', '.env');
33
require("dotenv").config({ path: env }); // , debug: false
4-
import { suite, test } from '@testdeck/mocha';
4+
import { suite, test, timeout } from '@testdeck/mocha';
55
import { Message } from "../OpenFlow/src/Messages/Message";
66
import { Config } from "../OpenFlow/src/Config";
77
import { DatabaseConnection } from '../OpenFlow/src/DatabaseConnection';
@@ -11,15 +11,17 @@ import { Auth } from '../OpenFlow/src/Auth';
1111
import { NoderedUtil, SigninMessage } from '@openiap/openflow-api';
1212

1313
@suite class auth_test {
14+
@timeout(10000)
1415
async before() {
16+
Config.workitem_queue_monitoring_enabled = false;
1517
Config.disablelogging();
1618
Logger.configure(true, true);
1719
Config.db = new DatabaseConnection(Config.mongodb_url, Config.mongodb_db, false);
1820
await Config.db.connect(null);
1921
}
2022
async after() {
2123
await Config.db.shutdown();
22-
Logger.otel.shutdown();
24+
await Logger.otel.shutdown();
2325
Auth.shutdown();
2426
}
2527
@test async 'ValidateByPassword'() {

‎test/Config.test.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const path = require("path");
22
const env = path.join(process.cwd(), 'config', '.env');
33
require("dotenv").config({ path: env }); // , debug: false
4-
import { suite, test } from '@testdeck/mocha';
4+
import { suite, test, timeout } from '@testdeck/mocha';
55
import { Config } from "../OpenFlow/src/Config";
66
import { DatabaseConnection } from '../OpenFlow/src/DatabaseConnection';
77
import assert = require('assert');
@@ -10,15 +10,17 @@ import { NoderedUtil } from '@openiap/openflow-api';
1010
import { Auth } from '../OpenFlow/src/Auth';
1111

1212
@suite class Config_test {
13+
@timeout(10000)
1314
async before() {
15+
Config.workitem_queue_monitoring_enabled = false;
1416
Config.disablelogging();
1517
Logger.configure(true, false);
1618
Config.db = new DatabaseConnection(Config.mongodb_url, Config.mongodb_db, false);
1719
await Config.db.connect(null);
1820
}
1921
async after() {
2022
await Config.db.shutdown();
21-
Logger.otel.shutdown();
23+
await Logger.otel.shutdown();
2224
Auth.shutdown();
2325
}
2426
@test 'reload'() {

‎test/Crypt.test.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const path = require("path");
22
const env = path.join(process.cwd(), 'config', '.env');
33
require("dotenv").config({ path: env }); // , debug: false
4-
import { suite, test } from '@testdeck/mocha';
4+
import { suite, test, timeout } from '@testdeck/mocha';
55
import { Config } from "../OpenFlow/src/Config";
66
import { DatabaseConnection } from '../OpenFlow/src/DatabaseConnection';
77
import assert = require('assert');
@@ -12,7 +12,9 @@ import { Crypt } from '../OpenFlow/src/Crypt';
1212
import { DBHelper } from '../OpenFlow/src/DBHelper';
1313
@suite class crypt_test {
1414
private testUser: User;
15+
@timeout(10000)
1516
async before() {
17+
Config.workitem_queue_monitoring_enabled = false;
1618
Config.disablelogging();
1719
Logger.configure(true, true);
1820
Config.db = new DatabaseConnection(Config.mongodb_url, Config.mongodb_db, false);
@@ -21,9 +23,10 @@ import { DBHelper } from '../OpenFlow/src/DBHelper';
2123
}
2224
async after() {
2325
await Config.db.shutdown();
24-
Logger.otel.shutdown();
26+
await Logger.otel.shutdown();
2527
Auth.shutdown();
2628
}
29+
@timeout(10000)
2730
@test async 'ValidatePassword'() {
2831
await Crypt.SetPassword(this.testUser, "randompassword", null);
2932
var result = await Crypt.ValidatePassword(this.testUser, "randompassword", null);

‎test/DBHelper.test.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ import { DBHelper } from '../OpenFlow/src/DBHelper';
1515
private rootToken: string;
1616
private testUser: User;
1717
private userToken: string;
18+
@timeout(10000)
1819
async before() {
20+
Config.workitem_queue_monitoring_enabled = false;
1921
Config.disablelogging();
2022
Logger.configure(true, true);
2123
Config.db = new DatabaseConnection(Config.mongodb_url, Config.mongodb_db, false);
@@ -26,7 +28,7 @@ import { DBHelper } from '../OpenFlow/src/DBHelper';
2628
}
2729
async after() {
2830
await Config.db.shutdown();
29-
Logger.otel.shutdown();
31+
await Logger.otel.shutdown();
3032
Auth.shutdown();
3133
}
3234
@test async 'FindByUsername'() {

‎test/DatabaseConnection.test.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ import { Crypt } from '../OpenFlow/src/Crypt';
1515
private rootToken: string;
1616
private testUser: User;
1717
private userToken: string;
18+
@timeout(10000)
1819
async before() {
20+
Config.workitem_queue_monitoring_enabled = false;
1921
Config.disablelogging();
2022
Logger.configure(true, true);
2123
Config.db = new DatabaseConnection(Config.mongodb_url, Config.mongodb_db, false);
@@ -26,7 +28,7 @@ import { Crypt } from '../OpenFlow/src/Crypt';
2628
}
2729
async after() {
2830
await Config.db.shutdown();
29-
Logger.otel.shutdown();
31+
await Logger.otel.shutdown();
3032
Auth.shutdown();
3133
}
3234
@test async 'dbconstructor'() {

‎test/KubeUtil.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,17 @@ import { KubeUtil } from '../OpenFlow/src/KubeUtil';
1010
import { Auth } from '../OpenFlow/src/Auth';
1111

1212
@suite class kubeutil_test {
13+
@timeout(10000)
1314
async before() {
15+
Config.workitem_queue_monitoring_enabled = false;
1416
Config.disablelogging();
1517
Logger.configure(true, true);
1618
Config.db = new DatabaseConnection(Config.mongodb_url, Config.mongodb_db, false);
1719
await Config.db.connect(null);
1820
}
1921
async after() {
2022
await Config.db.shutdown();
23+
await Logger.otel.shutdown();
2124
Auth.shutdown();
2225
}
2326
@test async 'GetStatefulSet'() {

‎test/Logger.test.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const path = require("path");
22
const env = path.join(process.cwd(), 'config', '.env');
33
require("dotenv").config({ path: env }); // , debug: false
4-
import { suite, test } from '@testdeck/mocha';
4+
import { suite, test, timeout } from '@testdeck/mocha';
55
import { Config } from "../OpenFlow/src/Config";
66
import { DatabaseConnection } from '../OpenFlow/src/DatabaseConnection';
77
import assert = require('assert');
@@ -11,15 +11,17 @@ import { license_data } from '../OpenFlow/src/otelspec';
1111
import { Auth } from '../OpenFlow/src/Auth';
1212

1313
@suite class logger_test {
14+
@timeout(10000)
1415
async before() {
16+
Config.workitem_queue_monitoring_enabled = false;
1517
Config.disablelogging();
1618
Logger.configure(true, false);
1719
Config.db = new DatabaseConnection(Config.mongodb_url, Config.mongodb_db, false);
1820
await Config.db.connect(null);
1921
}
2022
async after() {
2123
await Config.db.shutdown();
22-
Logger.otel.shutdown();
24+
await Logger.otel.shutdown();
2325
Logger.License.shutdown();
2426
Auth.shutdown();
2527
}

‎test/Message.test.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const path = require("path");
22
const env = path.join(process.cwd(), 'config', '.env');
33
require("dotenv").config({ path: env }); // , debug: false
4-
import { suite, test } from '@testdeck/mocha';
4+
import { suite, test, timeout } from '@testdeck/mocha';
55
import { Message } from "../OpenFlow/src/Messages/Message";
66
import { Config } from "../OpenFlow/src/Config";
77
import { DatabaseConnection } from '../OpenFlow/src/DatabaseConnection';
@@ -16,7 +16,9 @@ import { DBHelper } from '../OpenFlow/src/DBHelper';
1616
private rootToken: string;
1717
private testUser: User;
1818
private userToken: string;
19+
@timeout(10000)
1920
async before() {
21+
Config.workitem_queue_monitoring_enabled = false;
2022
Config.disablelogging();
2123
Logger.configure(true, true);
2224
Config.db = new DatabaseConnection(Config.mongodb_url, Config.mongodb_db, false);
@@ -27,7 +29,8 @@ import { DBHelper } from '../OpenFlow/src/DBHelper';
2729
}
2830
async after() {
2931
await Config.db.shutdown();
30-
Logger.otel.shutdown();
32+
await Logger.otel.shutdown();
33+
Logger.License.shutdown();
3134
Auth.shutdown();
3235
}
3336
@test async 'Unselect customer as root'() {

0 commit comments

Comments
 (0)