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

test for issue #145 #431

Merged
3 commits merged into from Feb 21, 2017
Merged

test for issue #145 #431

3 commits merged into from Feb 21, 2017

Conversation

ghost
Copy link

@ghost ghost commented Feb 20, 2017

this is a simple test to make sure that the method argument of concatenate contains the correct value (chain or compose).
It also checks to see that a media file (knights.mp4) is present. if it is not, it will download it from youtube. Note: user must have youtube-dl installed for this to work correctly.

@Zulko
Copy link
Owner

Zulko commented Feb 21, 2017

I like it, but you should then add 'tests/media' to the .gitignore so that the media downloaded by the tests won't be accidentally merged into the git repo.

@keikoro
Copy link
Collaborator

keikoro commented Feb 21, 2017

@Earney What's that first commit, the "Merge pull request 1 from Zulko/master"? It looks like an empty commit, could you just delete it to avoid unnecessary "pollution" of the commit history? (You'll be able to get rid of it by rebasing your commits, then force-pushing to your fork.)

@ghost
Copy link
Author

ghost commented Feb 21, 2017

@kerstin the first commit is a pull from the main fork zulko/master so that my repo is up to date, and contains all commits since I forked my repo. I'm not sure what will happen when I try merging back in to the main fork. I may try to merge it back in and see what happens. If the commit sticks around then I'll try rebasing in the future.

@ghost ghost merged commit d3582b1 into Zulko:master Feb 21, 2017
@ghost ghost deleted the pytest branch February 21, 2017 12:59
This pull request was closed.
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.

None yet

3 participants