Skip to content

Improved status cleanup - #22548

Merged
rullzer merged 6 commits into
masterfrom
bugfix/noid/improved_status_cleanup
Sep 7, 2020
Merged

Improved status cleanup#22548
rullzer merged 6 commits into
masterfrom
bugfix/noid/improved_status_cleanup

Conversation

@georgehrke

@georgehrkegeorgehrke commented Sep 2, 2020

Copy link
Copy Markdown
Member

No description provided.

@georgehrkegeorgehrke added the 2. developing Work in progress label Sep 2, 2020
@georgehrkegeorgehrke added this to the Nextcloud 20 milestone Sep 2, 2020
nickvergessen
nickvergessen reviewed Sep 3, 2020
View reviewed changes
Comment threadapps/user_status/lib/Connector/UserStatus.php Outdated
nickvergessen
nickvergessen reviewed Sep 3, 2020
View reviewed changes
Comment threadapps/user_status/lib/Service/StatusService.php Outdated
This was referenced Sep 3, 2020
Merged
Merged
@georgehrkegeorgehrke added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Sep 3, 2020
@georgehrke
georgehrke marked this pull request as ready for review September 3, 2020 14:25
ChristophWurst
ChristophWurst reviewed Sep 3, 2020
View reviewed changes
Comment threadapps/user_status/lib/Db/UserStatusMapper.php Outdated
@georgehrke
georgehrkeforce-pushed the bugfix/noid/improved_status_cleanup branch from 00aee2f to 73bbbadCompareSeptember 3, 2020 16:59
@georgehrke

georgehrke commented Sep 3, 2020

Copy link
Copy Markdown
MemberAuthor

Squashed fixup commits

@georgehrkegeorgehrke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Sep 3, 2020
@georgehrke

georgehrke commented Sep 3, 2020

Copy link
Copy Markdown
MemberAuthor

There is one PR related unit test failure. Will look into it tomorrow

@georgehrkegeorgehrke added 2. developing Work in progress and removed 4. to release Ready to be released and/or waiting for tests to finish labels Sep 3, 2020
@georgehrke
Introduce consts for statuses
a352a7c
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
@georgehrke
HeartbeatController: PHPDoc fixes
10df719
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
@georgehrke
Better cleanup routine for statuses
7fedd33
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
@georgehrke
georgehrkeforce-pushed the bugfix/noid/improved_status_cleanup branch from 73bbbad to 0bbf45cCompareSeptember 7, 2020 07:41
@georgehrke
Do not display Offline statuses in the Dashboard widget
5be4949
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
@georgehrke
Add MigrationStep to add better Indizes
2146950
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
@georgehrke
Always use IUserStatus consts
d7ccc61
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
@georgehrke
georgehrkeforce-pushed the bugfix/noid/improved_status_cleanup branch from 0bbf45c to d7ccc61CompareSeptember 7, 2020 09:30
@georgehrke

georgehrke commented Sep 7, 2020

Copy link
Copy Markdown
MemberAuthor

Squashed commits

@georgehrkegeorgehrke added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Sep 7, 2020
@faily-bot

faily-botBot commented Sep 7, 2020

Copy link
Copy Markdown

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 32743: failure

mysql5.6-php7.2

Show full log
There were 2 warnings:
1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static
2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static
--
There was 1 failure:
1) Test\Files\ObjectStore\ObjectStoreStorageTest::testCopyFromSameStorage with data set #0 ('/source.txt', '/target.txt')
Expected /target.txt to be a copy of /drone/src/tests/data/lorem.txt
Failed asserting that two strings are equal.
--- Expected
+++ Actual
@@ @@
-'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\n
-Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.\n
-Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.\n
-Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
+''
/drone/src/tests/lib/Files/Storage/Storage.php:222
/drone/src/tests/lib/Files/Storage/Storage.php:600

@rullzer
rullzer merged commit 99ee00b into masterSep 7, 2020
@rullzer
rullzer deleted the bugfix/noid/improved_status_cleanup branch September 7, 2020 13:19
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nickvergessennickvergessennickvergessen approved these changes
@ChristophWurstChristophWurstChristophWurst approved these changes
@rullzerrullzerAwaiting requested review from rullzer
@juliusknorrjuliusknorrAwaiting requested review from juliusknorr

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finish

Projects

None yet

Milestone

Nextcloud 20

Development

Successfully merging this pull request may close these issues.

4 participants

@georgehrke@nickvergessen@ChristophWurst@rullzer