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 part of #295: Change the CircleCI workflow #357

Merged
merged 17 commits into from
Nov 20, 2019
Merged

Conversation

vinitamurthi
Copy link
Contributor

@vinitamurthi vinitamurthi commented Nov 15, 2019

Explanation

This PR makes some changes to the circleCI workflow:

  1. Breakdown the tests into separate steps, and add a setup step similar to the web circleCI workflow
  2. Create two workflows: One for flaky tests and one for non-flaky tests, non-flaky tests should always pass.
    Follow up PRs will slowly move the flaky tests into the non-flaky queue and then we can finally block submit on this
    Also fix a network interceptor test
    Fixes part of Fix all broken tests on develop #295

Checklist

  • The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
  • The PR follows the style guide.
  • The PR does not contain any unnecessary auto-generated code from Android Studio.
  • The PR is made from a branch that's not called "develop".
  • The PR is made from a branch that is up-to-date with "develop".
  • The PR's branch is based on "develop" and not on any other branch.
  • The PR is assigned to an appropriate reviewer in both the Assignees and the Reviewers sections.

@vinitamurthi vinitamurthi changed the title [TEST] Fix tests for Circle CI Change the CircleCI workflow Nov 19, 2019
@vinitamurthi
Copy link
Contributor Author

@seanlip @BenHenning PTAL!

assertThat(subtopicResponse.isSuccessful).isTrue()
assertThat(subtopicResponse.body()!!.subtopicTitle).isEqualTo("Subtopic 1")
}
// @Test
Copy link
Member

Choose a reason for hiding this comment

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

Weird to see all this commented out. Is it intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oops, that was not intentional..removed it

@seanlip
Copy link
Member

seanlip commented Nov 19, 2019

/cc @kevinlee12 would you be up for taking a look at this PR, since you're familiar with CircleCI on oppia/oppia?

Copy link
Member

@seanlip seanlip left a comment

Choose a reason for hiding this comment

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

LGTM, though with the caveat that I'm not super familiar with CircleCI config -- I'll ping @kevinlee12 to ask if he has any comments based on his experience with oppia-web.

return JSONObject(json).toString()
return try {
JSONObject(json).toString()
} catch(e: JSONException) {
Copy link
Member

Choose a reason for hiding this comment

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

Nit: catch (

Copy link
Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

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

Thanks @vinitamurthi! Let's reference #295 in this PR, as well.

@vinitamurthi vinitamurthi changed the title Change the CircleCI workflow Fix part of #295: Change the CircleCI workflow Nov 20, 2019
@vinitamurthi vinitamurthi merged commit 98fc5b7 into develop Nov 20, 2019
Copy link

@kevinlee12 kevinlee12 left a comment

Choose a reason for hiding this comment

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

config looks good!

@vinitamurthi vinitamurthi deleted the circleci branch November 30, 2019 00:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants