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

Fixes most MODS import tests #1917

Closed
wants to merge 2 commits into from

Conversation

Projects
None yet
3 participants
@retorquere
Copy link
Contributor

retorquere commented Mar 28, 2019

One still remains but I don't know MODS well enough to decide what to do; I've sent a message to Simon to ask.

@dstillman

This comment has been minimized.

Copy link
Member

dstillman commented Mar 29, 2019

Simon isn't involved with Zotero development anymore, so if you have a question you should ask it here and hopefully someone will know.

@dstillman

This comment has been minimized.

Copy link
Member

dstillman commented Mar 29, 2019

As we've discussed, lint changes should be in separate commits so they can be reviewed quickly, separately from substantive changes. Can you fix that and force-push?

@retorquere

This comment has been minimized.

Copy link
Contributor Author

retorquere commented Mar 29, 2019

So if I understand correctly - you prefer changes to translators in one PR, but one PR with two commits - one that does the lint changes, one that does functional changes?

@dstillman

This comment has been minimized.

Copy link
Member

dstillman commented Mar 29, 2019

That's right.

@retorquere

This comment has been minimized.

Copy link
Contributor Author

retorquere commented Mar 29, 2019

Alright, I didn't get that from the earlier discussion, but I'll do that Sunday.

@retorquere retorquere force-pushed the retorquere:MODS-import-test branch from b270208 to 69b6e48 Mar 30, 2019

@retorquere

This comment has been minimized.

Copy link
Contributor Author

retorquere commented Mar 30, 2019

OK, can you look at the lint reports first before I stack the other changes on to them?

@dstillman

This comment has been minimized.

Copy link
Member

dstillman commented Mar 30, 2019

It won't necessarily be me reviewing this, but there's no need to do this in stages. Git makes it easy to add changes to previous commits:

https://stackoverflow.com/a/1186549

or

https://fle.github.io/git-tip-keep-your-branch-clean-with-fixup-and-autosquash.html

@retorquere

This comment has been minimized.

Copy link
Contributor Author

retorquere commented Mar 30, 2019

As much as I love git, rebase still terrifies me. If it's OK with you (or whomever might end up reviewing this), I'd prefer to wait and stack the commits using regular add.

@adam3smith

This comment has been minimized.

Copy link
Collaborator

adam3smith commented Apr 11, 2019

@retorquere -- I had a look and all the changes look fine. I think the remaining linting error should disappear on your next push as we added detectImport to the exceptions a while ago.

@adam3smith

This comment has been minimized.

Copy link
Collaborator

adam3smith commented Apr 11, 2019

If you have substantive changes you want to make -- I have this one that I'd want to also include: adam3smith@783ac38

@retorquere

This comment has been minimized.

Copy link
Contributor Author

retorquere commented Apr 11, 2019

I was going to address the import tests in this PR, but my understanding of how they're going to be used has changed -- I thought the translation-server would be the test runner for the testCases, but the import tests in the translation server are directed towards validating translation-server itself (if I understand @dstillman correctly), not towards validating what's produced by the translator with the testCases (which is subtly but importantly different). I currently don't know how to do the latter, but any "substantive" change I was going to make would be directed at making the import tests pass.

At this stage, it may be easier to just close this PR and work from adam3smith@783ac38

@dstillman

This comment has been minimized.

Copy link
Member

dstillman commented Apr 12, 2019

One way or another, please be sure to rebase to remove the merge commit before merging. Again, there should almost never be merge commits in PRs, and certainly never merges back from the master branch.

@adam3smith

This comment has been minimized.

Copy link
Collaborator

adam3smith commented Apr 12, 2019

Closed via #1928

@retorquere -- I'm not sure what you were referring to with the import tests. The way we create and run them is in Scaffold, and all tests pass in the current MODS translator, so nothing to fix there, but I may be misunderstanding.

@adam3smith adam3smith closed this Apr 12, 2019

@retorquere

This comment has been minimized.

Copy link
Contributor Author

retorquere commented Apr 12, 2019

The misunderstanding was from me, and you clarified it earlier. I knew scaffold was a way to run the tests but I didn't realize it was the way to run the tests. I thought I was working towards a way to have the import tests be runnable automatically so that they could, in principle, be ran in CI (so as to prevent something like my gaffe with the BibTeX translator happening again), but as you pointed out earlier, that's not strictly what the tests on translation-server are for.

@dstillman

This comment has been minimized.

Copy link
Member

dstillman commented Apr 12, 2019

You're still confusing the translation-server tests and the translator tests. As I've noted, translator tests are already run automatically, and they could be run via CI in this repo.

@retorquere

This comment has been minimized.

Copy link
Contributor Author

retorquere commented Apr 12, 2019

Which is exactly my point. I was confusing them, and you corrected that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.