Skip to content
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.

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

Fix postgres integration tests #7517

Merged
merged 5 commits into from
Jul 7, 2022

Conversation

nickvergessen
Copy link
Member

No description provided.

@nickvergessen nickvergessen added 2. developing feature: chat 💬 Chat and system messages feature: api 🛠️ OCS API for conversations, chats and participants labels Jul 5, 2022
@nickvergessen nickvergessen added this to the 💚 Next Major (25) milestone Jul 5, 2022
@nickvergessen nickvergessen self-assigned this Jul 5, 2022
@nickvergessen nickvergessen changed the title Bugfix/noid/fix postgres integration tests Fix postgres integration tests Jul 5, 2022
@nickvergessen nickvergessen requested a review from vitormattos July 5, 2022 15:50
@@ -222,7 +222,7 @@ public function createCommentObject(array $row): ?IComment {
'creation_timestamp' => $row['comment_creation_timestamp'],
'latest_child_timestamp' => $row['comment_latest_child_timestamp'],
'reactions' => $row['comment_reactions'],
'expire_date' => $row['expire_date'],
'expire_date' => $row['comment_expire_date'],
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

{"Exception":"Error","Message":"Undefined array key \"expire_date\" at \/drone\/server\/apps\/spreed\/lib\/Manager.php#225","Code":0,"Trace":[{"file":"\/drone\/server\/apps\/spreed\/lib\/Manager.php","line":225,"function":"onError","class":"OC\\Log\\ErrorHandler","type":"::"},{"file":"\/drone\/server\/apps\/spreed\/lib\/Manager.php","line":150,"function":"createCommentObject","class":"OCA\\Talk\\Manager","type":"->"},{"file":"\/drone\/server\/apps\/spreed\/lib\/Manager.php","line":343,"function":"createRoomObject","class":"OCA\\Talk\\Manager","type":"->"},{"file":"\/drone\/server\/apps\/spreed\/lib\/Manager.php","line":300,"function":"getRoomsForActor","class":"OCA\\Talk\\Manager","type":"->"},{"file":"\/drone\/server\/apps\/spreed\/lib\/Controller\/RoomController.php","line":194,"function":"getRoomsForUser","class":"OCA\\Talk\\Manager","type":"->"},{"file":"\/drone\/server\/lib\/private\/AppFramework\/Http\/Dispatcher.php","line":225,"function":"getRooms","class":"OCA\\Talk\\Controller\\RoomController","type":"->"},{"file":"\/drone\/server\/lib\/private\/AppFramework\/Http\/Dispatcher.php","line":133,"function":"executeController","class":"OC\\AppFramework\\Http\\Dispatcher","type":"->"},{"file":"\/drone\/server\/lib\/private\/AppFramework\/App.php","line":172,"function":"dispatch","class":"OC\\AppFramework\\Http\\Dispatcher","type":"->"},{"file":"\/drone\/server\/lib\/private\/Route\/Router.php","line":298,"function":"main","class":"OC\\AppFramework\\App","type":"::"},{"file":"\/drone\/server\/ocs\/v1.php","line":62,"function":"match","class":"OC\\Route\\Router","type":"->"},{"file":"\/drone\/server\/ocs\/v2.php","line":23,"args":["\/drone\/server\/ocs\/v1.php"],"function":"require_once"}],"File":"\/drone\/server\/lib\/private\/Log\/ErrorHandler.php","Line":92,"CustomMessage":"--"}

$result = $query->executeQuery();
return $result->fetchOne();
$roomId = (int) $result->fetchOne();
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

{"Exception":"Exception","Message":"OCA\\SpreedCheats\\Controller\\ApiController::getRoomIdByToken(): Return value must be of type ?string, int returned in file '\/drone\/server\/apps\/spreedcheats\/lib\/Controller\/ApiController.php' line 141","Code":0,"Trace":[{"file":"\/drone\/server\/lib\/private\/AppFramework\/App.php","line":172,"function":"dispatch","class":"OC\\AppFramework\\Http\\Dispatcher","type":"->"},{"file":"\/drone\/server\/lib\/private\/Route\/Router.php","line":298,"function":"main","class":"OC\\AppFramework\\App","type":"::"},{"file":"\/drone\/server\/ocs\/v1.php","line":62,"function":"match","class":"OC\\Route\\Router","type":"->"},{"file":"\/drone\/server\/ocs\/v2.php","line":23,"args":["\/drone\/server\/ocs\/v1.php"],"function":"require_once"}],"File":"\/drone\/server\/lib\/private\/AppFramework\/Http\/Dispatcher.php","Line":165,"Previous":{"Exception":"TypeError","Message":"OCA\\SpreedCheats\\Controller\\ApiController::getRoomIdByToken(): Return value must be of type ?string, int returned","Code":0,"Trace":[{"file":"\/drone\/server\/apps\/spreedcheats\/lib\/Controller\/ApiController.php","line":114,"function":"getRoomIdByToken","class":"OCA\\SpreedCheats\\Controller\\ApiController","type":"->"},{"file":"\/drone\/server\/lib\/private\/AppFramework\/Http\/Dispatcher.php","line":225,"function":"getMessageExpirationJob","class":"OCA\\SpreedCheats\\Controller\\ApiController","type":"->"},{"file":"\/drone\/server\/lib\/private\/AppFramework\/Http\/Dispatcher.php","line":133,"function":"executeController","class":"OC\\AppFramework\\Http\\Dispatcher","type":"->"},{"file":"\/drone\/server\/lib\/private\/AppFramework\/App.php","line":172,"function":"dispatch","class":"OC\\AppFramework\\Http\\Dispatcher","type":"->"},{"file":"\/drone\/server\/lib\/private\/Route\/Router.php","line":298,"function":"main","class":"OC\\AppFramework\\App","type":"::"},{"file":"\/drone\/server\/ocs\/v1.php","line":62,"function":"match","class":"OC\\Route\\Router","type":"->"},{"file":"\/drone\/server\/ocs\/v2.php","line":23,"args":["\/drone\/server\/ocs\/v1.php"],"function":"require_once"}],"File":"\/drone\/server\/apps\/spreedcheats\/lib\/Controller\/ApiController.php","Line":141},"CustomMessage":"--"}

@nickvergessen
Copy link
Member Author

Tests are finally green, please review so I can revert the postgres drone file change and merge the PR tomorrow morning after CI is done.

cc @danxuliu @vitormattos

@nickvergessen nickvergessen requested a review from danxuliu July 6, 2022 14:14
Copy link
Member

@danxuliu danxuliu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look good 👍

But please drop the Debug commit with an interactive rebase and force push rather than just revert it :-P

@nickvergessen
Copy link
Member Author

But please drop the Debug commit with an interactive rebase and force push rather than just revert it :-P

That is what reverting is to me unless it was merged into master/main :-P

@nickvergessen nickvergessen force-pushed the bugfix/noid/fix-postgres-integration-tests branch from b6a0c67 to 6452acf Compare July 6, 2022 20:49
@nickvergessen nickvergessen merged commit da0ec90 into master Jul 7, 2022
@nickvergessen nickvergessen deleted the bugfix/noid/fix-postgres-integration-tests branch July 7, 2022 08:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release feature: api 🛠️ OCS API for conversations, chats and participants feature: chat 💬 Chat and system messages
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants