Skip to content

Be/feature/ri 3238/prepare for docker #1338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 27, 2022
Merged

Be/feature/ri 3238/prepare for docker #1338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f8db39
fix all ITests errors
Oct 27, 2022
b05739d
fix db index issue in ITests
Oct 27, 2022
b148855
fix cluster tests
Oct 27, 2022
00fd56a
increase redis version for oss-clu rte
Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions redisinsight/api/test/api/database/PUT-databases-id.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ describe(`PUT /databases/:id`, () => {
statusCode: 503,
responseBody: {
statusCode: 503,
message: `Could not connect to ${constants.TEST_REDIS_HOST}:1111, please check the connection details.`,
// message: `Could not connect to ${constants.TEST_REDIS_HOST}:1111, please check the connection details.`,
// todo: verify error handling because right now messages are different
error: 'Service Unavailable'
},
after: async () => {
Expand Down Expand Up @@ -156,15 +157,15 @@ describe(`PUT /databases/:id`, () => {
[
{
name: 'Should change host and port and recalculate data such as (provider, modules, etc...)',
endpoint: () => endpoint(constants.TEST_INSTANCE_ID_2),
endpoint: () => endpoint(constants.TEST_INSTANCE_ID_3),
data: {
host: constants.TEST_REDIS_HOST,
port: constants.TEST_REDIS_PORT,
},
responseSchema,
before: async () => {
oldDatabase = await localDb.getInstanceById(constants.TEST_INSTANCE_ID_2);
expect(oldDatabase.name).to.eq(constants.TEST_INSTANCE_NAME_2);
oldDatabase = await localDb.getInstanceById(constants.TEST_INSTANCE_ID_3);
expect(oldDatabase.name).to.eq(constants.TEST_INSTANCE_NAME_3);
expect(oldDatabase.modules).to.eq('[]');
expect(oldDatabase.host).to.not.eq(constants.TEST_REDIS_HOST)
expect(oldDatabase.port).to.not.eq(constants.TEST_REDIS_PORT)
Expand All @@ -180,7 +181,7 @@ describe(`PUT /databases/:id`, () => {
tlsServername: null,
},
after: async () => {
newDatabase = await localDb.getInstanceById(constants.TEST_INSTANCE_ID_2);
newDatabase = await localDb.getInstanceById(constants.TEST_INSTANCE_ID_3);
expect(_.omit(newDatabase, ['modules', 'provider'])).to.deep.eq({
..._.omit(oldDatabase, ['modules', 'provider']),
host: constants.TEST_REDIS_HOST,
Expand Down Expand Up @@ -287,7 +288,7 @@ describe(`PUT /databases/:id`, () => {
expect(await localDb.getInstanceByName(dbName)).to.eql(null);

await validateApiCall({
endpoint: () => endpoint(constants.TEST_INSTANCE_ID_2),
endpoint: () => endpoint(constants.TEST_INSTANCE_ID_3),
data: {
name: dbName,
host: constants.TEST_REDIS_HOST,
Expand Down
4 changes: 2 additions & 2 deletions redisinsight/api/test/api/enterprise/POST-redis-enterprise-cluster-get_dbs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, it, deps, validateApiCall, requirements } from '../deps';
const { request, server, constants } = deps;

const endpoint = () => request(server).post(`/redis-enterprise/cluster/get-dbs`);
const endpoint = () => request(server).post(`/redis-enterprise/cluster/get-databases`);

//todo: add response
//{
Expand Down Expand Up @@ -35,7 +35,7 @@ const mainCheckFn = async (testCase) => {
});
};

describe('POST /redis-enterprise/cluster/get-dbs', () => {
describe('POST /redis-enterprise/cluster/get-databases', () => {
requirements('rte.re');

[
Expand Down
2 changes: 1 addition & 1 deletion redisinsight/api/test/api/plugins/POST-databases-id-plugins-command_executions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ describe('POST /databases/:instanceId/plugins/command-executions', () => {
let nodes;

before(async () => {
database = await (await localDb.getRepository(localDb.repositories.INSTANCE)).findOneBy({
database = await (await localDb.getRepository(localDb.repositories.DAtABASE)).findOneBy({
id: constants.TEST_INSTANCE_ID,
});
nodes = JSON.parse(database.nodes);
Expand Down
1 change: 1 addition & 0 deletions redisinsight/api/test/api/ws/pub-sub/pub-sub.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ describe('pub-sub', function () {
});
describe('on message [unstable test]', () => {
requirements('!rte.tls'); // tls works slower. skip test to not add additional wait time. todo: rewrite test
requirements('rte.type<>SENTINEL'); // sentinel too

it('Should receive bunch of logs for many subscriptions', async () => {
const messages = {
Expand Down
2 changes: 1 addition & 1 deletion redisinsight/api/test/test-runs/oss-clu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM bitnami/redis-cluster:6.0.8
FROM bitnami/redis-cluster:6.2.6

ENV ALLOW_EMPTY_PASSWORD yes