Skip to content

Commit 2c9c7bd

Browse files
authored
Merge pull request #9028 from romayalon/romy-CI-improve-times-pool-list-hosts-reduce
Tests | Decrease number of hosts of created pool for tests
2 parents c42c9ac + 6397a14 commit 2c9c7bd

16 files changed

+15
-49
lines changed

src/test/unit_tests/coretest.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ const SYSTEM = CORETEST;
8080
const EMAIL = `${CORETEST}@noobaa.com`;
8181
const PASSWORD = CORETEST;
8282
const POOL_LIST = [{
83-
name: 'pool-with-10-hosts',
84-
host_count: 10
83+
name: 'pool-with-5-hosts',
84+
host_count: 5
8585
},
8686
{
8787
name: 'pool-with-1-host',

src/test/unit_tests/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ require('./test_s3select');
6363
require('./test_nsfs_glacier_backend');
6464

6565
// // SERVERS
66-
require('./test_agent');
6766

6867
// ------------------------------------
6968
// A test that initialize the pool list

src/test/unit_tests/lifecycle_index.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/test/unit_tests/mdsequence_index.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/test/unit_tests/test_agent.js

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/test/unit_tests/test_agent_blocks_reclaimer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// setup coretest first to prepare the env
55
const coretest = require('./coretest');
6-
coretest.setup({ pools_to_create: [coretest.POOL_LIST[0]] });
6+
coretest.setup({ pools_to_create: [coretest.POOL_LIST[1]] });
77

88
const _ = require('lodash');
99
const mocha = require('mocha');

src/test/unit_tests/test_bucket_replication.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const cloud_utils = require('../../util/cloud_utils');
1414
const { ReplicationScanner } = require('../../server/bg_services/replication_scanner');
1515

1616
const db_client = require('../../util/db_client').instance();
17-
coretest.setup({ pools_to_create: [coretest.POOL_LIST[0]] });
17+
coretest.setup({ pools_to_create: [coretest.POOL_LIST[1]] });
1818

1919
mocha.describe('replication configuration validity tests', function() {
2020
const bucket1 = 'bucket1-br';

src/test/unit_tests/test_lifecycle.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const P = require('../../util/promise');
2020
const config = require('../../../config');
2121
const MDStore = require('../../server/object_services/md_store').MDStore;
2222
const coretest = require('./coretest');
23+
coretest.setup({ pools_to_create: [coretest.POOL_LIST[1]] });
2324
const lifecycle = require('../../server/bg_services/lifecycle');
2425
const http_utils = require('../../util/http_utils');
2526
const test_utils = require('../../../src/test/system_tests/test_utils');

src/test/unit_tests/test_md_aggregator_unit.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
// setup coretest first to prepare the env
66
const coretest = require('./coretest');
7-
coretest.setup({ pools_to_create: [coretest.POOL_LIST[0]] });
7+
coretest.setup();
88

99
const _ = require('lodash');
1010
const util = require('util');

src/test/unit_tests/test_md_store.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// setup coretest first to prepare the env
55
const coretest = require('./coretest');
6-
coretest.setup({ pools_to_create: [coretest.POOL_LIST[0]] });
6+
coretest.setup();
77

88
const _ = require('lodash');
99
const mocha = require('mocha');

src/test/unit_tests/test_mdsequence.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
/* Copyright (C) 2022 NooBaa */
22
'use strict';
33

4+
const coretest = require('./coretest');
5+
coretest.setup();
6+
47
const mocha = require('mocha');
58
const assert = require('assert');
69
const config = require('../../../config');

src/test/unit_tests/test_nodes_store.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// setup coretest first to prepare the env
55
const coretest = require('./coretest');
6-
coretest.setup({ pools_to_create: [coretest.POOL_LIST[0]] });
6+
coretest.setup();
77

88
// const _ = require('lodash');
99
const mocha = require('mocha');

src/test/unit_tests/test_sts.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// setup coretest first to prepare the env
55
const coretest = require('./coretest');
6-
coretest.setup({ pools_to_create: coretest.POOL_LIST[1] });
6+
coretest.setup();
77
const AWS = require('aws-sdk');
88
const https = require('https');
99
const mocha = require('mocha');

src/test/unit_tests/test_system_servers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const check_deletion_ownership = require('../../server/system_services/pool_serv
2020
mocha.describe('system_servers', function() {
2121

2222
const { rpc_client, SYSTEM, EMAIL, PASSWORD, POOL_LIST } = coretest;
23-
const DEFAULT_POOL_NAME = POOL_LIST[0].name;
23+
const DEFAULT_POOL_NAME = POOL_LIST[1].name;
2424
const PREFIX = 'system-servers';
2525
const TIER = `${PREFIX}-tier`;
2626
const TIERING_POLICY = `${PREFIX}-tiering-policy`;

src/test/unit_tests/test_system_store.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const coretest = require('./coretest');
77
const db_client = require('../../util/db_client');
88

99
// setup coretest first to prepare the env
10-
coretest.setup({ pools_to_create: [coretest.POOL_LIST[0]] });
10+
coretest.setup();
1111

1212

1313
mocha.describe('system_store', function() {

src/test/unit_tests/test_tiering_ttl_worker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// setup coretest first to prepare the env
55
const { setup, rpc_client, POOL_LIST } = require('./coretest');
6-
setup({ pools_to_create: [POOL_LIST[0]] });
6+
setup({ pools_to_create: [POOL_LIST[1]] });
77

88
// const _ = require('lodash');
99
const mocha = require('mocha');

0 commit comments

Comments
 (0)