Skip to content

Revert stopgaps related to beta server cert issue #3396

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 2 commits into from
Mar 13, 2020
Merged

Revert stopgaps related to beta server cert issue #3396

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bdc773
Revert stopgaps related to beta server cert issue
kaartic-sn-20010 Feb 8, 2020
4612df5
Test-fix: fix the failing CI test
kaartic-sn-20010 Feb 13, 2020
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
Prev Previous commit
Test-fix: fix the failing CI test
  • Loading branch information
@kaartic-sn-20010
kaartic-sn-20010 committed Feb 13, 2020
commit 4612df55749fc45663b9632c510e0bfea6268930
6 changes: 2 additions & 4 deletions app/src/test/kotlin/fr/free/nrw/commons/TestCommonsApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package fr.free.nrw.commons
Copy link
Member Author

Choose a reason for hiding this comment

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

Reverting the changes in this file to the way they were in fa87eb5 seems to fix the CI issue. I couldn't see why this is the case. Can anyone shed some light about this?

Copy link
Member Author

Choose a reason for hiding this comment

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

cc: @ashishkumar468


import android.app.Application
import android.content.ContentProviderClient
import android.content.Context
import androidx.collection.LruCache
Expand All @@ -14,7 +15,7 @@ import fr.free.nrw.commons.di.DaggerCommonsApplicationComponent
import fr.free.nrw.commons.kvstore.JsonKvStore
import fr.free.nrw.commons.location.LocationServiceManager

class TestCommonsApplication : CommonsApplication() {
class TestCommonsApplication : Application() {
private var mockApplicationComponent: CommonsApplicationComponent? = null

override fun onCreate() {
Expand All @@ -25,9 +26,6 @@ class TestCommonsApplication : CommonsApplication() {
}
super.onCreate()
}

// No leakcanary in unit tests.
override fun setupLeakCanary(): RefWatcher = RefWatcher.DISABLED
}

@Suppress("MemberVisibilityCanBePrivate")
Expand Down