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 some tests : make coverage -> test #2492

Merged
merged 3 commits into from
Sep 12, 2017

Conversation

sapk
Copy link
Member

@sapk sapk commented Sep 11, 2017

make coverage use mysql database in paralell than test-mysql. That introduce test fails for test like GPG that insert key at runtime.

And some quick fix of missed error during PRs.

Copy link
Member

@jonasfranz jonasfranz left a comment

Choose a reason for hiding this comment

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

@@ -42,7 +42,7 @@ func NewMessageFrom(to []string, from, subject, body string) *Message {

plainBody, err := html2text.FromString(body)
if err != nil || setting.MailService.SendAsPlainText {
if strings.Contains(base.TruncateString(body, 100), "<html>"){
if strings.Contains(base.TruncateString(body, 100), "<html>") {
Copy link
Member

Choose a reason for hiding this comment

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

Please revert a885c7f since theire is already a PR for this: #2490

Copy link
Member Author

Choose a reason for hiding this comment

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

Good catch

@sapk
Copy link
Member Author

sapk commented Sep 11, 2017

@JonasFranzDEV Yes, I haven't look in detail for the part still failling. I have mostly look for the what happen aroung the GPG part since I have worked on it. ^^

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 11, 2017
@sapk sapk changed the title Fix test : make coverage -> test Fix some tests : make coverage -> test Sep 11, 2017
@lafriks lafriks force-pushed the fix-tests-again branch 3 times, most recently from 8aa5434 to d882aed Compare September 11, 2017 23:08
@lunny
Copy link
Member

lunny commented Sep 12, 2017

But why so many files changed?

@lunny lunny added this to the 1.3.0 milestone Sep 12, 2017
@lunny lunny added the topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile label Sep 12, 2017
@lafriks
Copy link
Member

lafriks commented Sep 12, 2017

@lunny I just moved integrations/gitea-repositories-meta/gitea-repositories to integrations/gitea-repositories-meta so that for each (mysql/pgsql/sqlite) sepearate gitea-repositories-* directory could be used and there is no hardcoded value but app.ini configuration value is reused

@lunny
Copy link
Member

lunny commented Sep 12, 2017

LGTM

@tboerger tboerger added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Sep 12, 2017
@appleboy
Copy link
Member

LGTM

@tboerger tboerger added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Sep 12, 2017
@appleboy appleboy merged commit 69dfe43 into go-gitea:master Sep 12, 2017
@lafriks lafriks deleted the fix-tests-again branch September 12, 2017 06:02
@sapk
Copy link
Member Author

sapk commented Sep 12, 2017

thx @lafriks

@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants