Paths

Table of Contentst

-
services/tunnelbroker/
-
tunnelbroker/
-
CMakeLists.txt
-
test/
-
main.cpp

[Services] Fix tunnelbroker ctest usage
ClosedPublic
Actions

Authored by • jon on Aug 9 2022, 10:43 AM.

Details

Reviewers

atul
• max
• karol

Commits

rCOMMaabb0e14f1af: [Services] Fix tunnelbroker ctest usage

Summary

Update gtest usage to be more canonical

Depends on D4781

Test Plan

nix develop

cd services/tunnelbroker
export COMM_TEST_SERVICES=1
rm -rf build
mkdir build
cd build

cmake ..
make -j
ctest # test suite should run

If you want the test suite to fully pass, you need to also follow
https://github.com/CommE2E/comm/blob/master/docs/dev_services.md#rabbitmq-tunnelbroker-only

Unfortunately, the logic for finding the tunnelbroker.ini file still
assumes docker-only paths

Diff Detail

Repository

rCOMM Comm

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

• jon created this revision.Aug 9 2022, 10:43 AM

Herald added subscribers: • abosh, • adrian, tomek, ashoat. · View Herald TranscriptAug 9 2022, 10:43 AM

Harbormaster completed remote builds in B11250: Diff 15485.Aug 9 2022, 10:55 AM

• jon requested review of this revision.Aug 9 2022, 10:55 AM

ashoat added 1 blocking reviewer(s): • max.Aug 9 2022, 12:03 PM

Followed the Test Plan and confirmed that everything worked as expected!

Didn't bother setting up RabbitMQ to get all of the tests to pass, but I think the ones expected to succeed did.

services/tunnelbroker/CMakeLists.txt
110	Is this an unrelated change, or is it connected in some way?

• jon marked an inline comment as done.Aug 10 2022, 1:32 PM

• jon added inline comments.

services/tunnelbroker/CMakeLists.txt
110	not directly related, I missed it in https://phab.comm.dev/D4671

Seems that this should be fixed from the tunnelbroker side to run it in a nix:

Unfortunately, the logic for finding the tunnelbroker.ini file still
assumes docker-only paths

I have created a task for it as ENG-1589.

This revision is now accepted and ready to land.Aug 10 2022, 3:28 PM

Closed by commit rCOMMaabb0e14f1af: [Services] Fix tunnelbroker ctest usage (authored by • jon). · Explain WhyAug 10 2022, 4:21 PM

This revision was automatically updated to reflect the committed changes.

• jon marked an inline comment as done.

• jon added a commit: rCOMMaabb0e14f1af: [Services] Fix tunnelbroker ctest usage.

Revision Contents
Changeset List

Path

Size

services/

tunnelbroker/

CMakeLists.txt

20 lines

test/

main.cpp

6 lines

Diff 15485

View Options

services/tunnelbroker/CMakeLists.txt

Show First 20 Lines • Show All 368 Lines • ▼ Show 20 Lines	currentUser: {
subscription: {		subscription: {
pushNotifs: false,		pushNotifs: false,
home: false,		home: false,
},		},
unread: false,		unread: false,
},		},
repliesCount: 0,		repliesCount: 0,
sourceMessageID,		sourceMessageID,
		pinnedCount: 0,
};		};

const userInfos = {};		const userInfos = {};
for (const member of members) {		for (const member of members) {
const { id, username } = member;		const { id, username } = member;
userInfos[id] = { id, username };		userInfos[id] = { id, username };
}		}

▲ Show 20 Lines • Show All 307 Lines • ▼ Show 20 Lines
type RawThreadInfoOptions = {		type RawThreadInfoOptions = {
+includeVisibilityRules?: ?boolean,		+includeVisibilityRules?: ?boolean,
+filterMemberList?: ?boolean,		+filterMemberList?: ?boolean,
+hideThreadStructure?: ?boolean,		+hideThreadStructure?: ?boolean,
+shimThreadTypes?: ?{		+shimThreadTypes?: ?{
+[inType: ThreadType]: ThreadType,		+[inType: ThreadType]: ThreadType,
},		},
+filterDetailedThreadEditPermissions?: boolean,		+filterDetailedThreadEditPermissions?: boolean,
		+excludePinnedCount?: boolean,
};		};
function rawThreadInfoFromServerThreadInfo(		function rawThreadInfoFromServerThreadInfo(
serverThreadInfo: ServerThreadInfo,		serverThreadInfo: ServerThreadInfo,
viewerID: string,		viewerID: string,
options?: RawThreadInfoOptions,		options?: RawThreadInfoOptions,
): ?RawThreadInfo {		): ?RawThreadInfo {
const includeVisibilityRules = options?.includeVisibilityRules;		const includeVisibilityRules = options?.includeVisibilityRules;
const filterMemberList = options?.filterMemberList;		const filterMemberList = options?.filterMemberList;
const hideThreadStructure = options?.hideThreadStructure;		const hideThreadStructure = options?.hideThreadStructure;
const shimThreadTypes = options?.shimThreadTypes;		const shimThreadTypes = options?.shimThreadTypes;
const filterDetailedThreadEditPermissions =		const filterDetailedThreadEditPermissions =
options?.filterDetailedThreadEditPermissions;		options?.filterDetailedThreadEditPermissions;
		const excludePinnedCount = options?.excludePinnedCount;

const members = [];		const members = [];
let currentUser;		let currentUser;
for (const serverMember of serverThreadInfo.members) {		for (const serverMember of serverThreadInfo.members) {
if (		if (
filterMemberList &&		filterMemberList &&
serverMember.id !== viewerID &&		serverMember.id !== viewerID &&
!serverMember.role &&		!serverMember.role &&
▲ Show 20 Lines • Show All 87 Lines • ▼ Show 20 Lines	if (serverThreadInfo.avatar) {
rawThreadInfo = { ...rawThreadInfo, avatar: serverThreadInfo.avatar };		rawThreadInfo = { ...rawThreadInfo, avatar: serverThreadInfo.avatar };
}		}
if (includeVisibilityRules) {		if (includeVisibilityRules) {
return {		return {
...rawThreadInfo,		...rawThreadInfo,
visibilityRules: rawThreadInfo.type,		visibilityRules: rawThreadInfo.type,
};		};
}		}
		if (!excludePinnedCount) {
		return {
		...rawThreadInfo,
		pinnedCount: serverThreadInfo.pinnedCount,
		};
		}
return rawThreadInfo;		return rawThreadInfo;
}		}

function filterThreadEditDetailedPermissions(		function filterThreadEditDetailedPermissions(
permissions: ThreadPermissionsInfo,		permissions: ThreadPermissionsInfo,
shouldFilter: ?boolean,		shouldFilter: ?boolean,
): ThreadPermissionsInfo {		): ThreadPermissionsInfo {
if (!shouldFilter) {		if (!shouldFilter) {
▲ Show 20 Lines • Show All 43 Lines • ▼ Show 20 Lines	let threadInfo: ThreadInfo = {
roles: rawThreadInfo.roles,		roles: rawThreadInfo.roles,
currentUser: getCurrentUser(rawThreadInfo, viewerID, userInfos),		currentUser: getCurrentUser(rawThreadInfo, viewerID, userInfos),
repliesCount: rawThreadInfo.repliesCount,		repliesCount: rawThreadInfo.repliesCount,
};		};
threadInfo = {		threadInfo = {
...threadInfo,		...threadInfo,
uiName: threadUIName(threadInfo),		uiName: threadUIName(threadInfo),
};		};
const { sourceMessageID, avatar } = rawThreadInfo;		const { sourceMessageID, avatar, pinnedCount } = rawThreadInfo;
if (sourceMessageID) {		if (sourceMessageID) {
threadInfo = { ...threadInfo, sourceMessageID };		threadInfo = { ...threadInfo, sourceMessageID };
}		}

if (avatar) {		if (avatar) {
threadInfo = { ...threadInfo, avatar };		threadInfo = { ...threadInfo, avatar };
} else if (		} else if (
rawThreadInfo.type === threadTypes.PERSONAL \|\|		rawThreadInfo.type === threadTypes.PERSONAL \|\|
rawThreadInfo.type === threadTypes.PRIVATE		rawThreadInfo.type === threadTypes.PRIVATE
) {		) {
threadInfo = {		threadInfo = {
...threadInfo,		...threadInfo,
avatar: getUserAvatarForThread(rawThreadInfo, viewerID, userInfos),		avatar: getUserAvatarForThread(rawThreadInfo, viewerID, userInfos),
};		};
}		}

		if (pinnedCount) {
		threadInfo = { ...threadInfo, pinnedCount };
		}

return threadInfo;		return threadInfo;
}		}

function getCurrentUser(		function getCurrentUser(
threadInfo: RawThreadInfo \| ThreadInfo,		threadInfo: RawThreadInfo \| ThreadInfo,
viewerID: ?string,		viewerID: ?string,
userInfos: UserInfos,		userInfos: UserInfos,
): ThreadCurrentUserInfo {		): ThreadCurrentUserInfo {
▲ Show 20 Lines • Show All 712 Lines • Show Last 20 Lines