Skip to content

Conversation

@ghost
Copy link

@ghost ghost commented Aug 19, 2016

No description provided.


row = self.REPORT_CLASS_TMPL % dict(
style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or 'passClass',
style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or ns and 'skipClass' or 'passClass',
Copy link
Owner

Choose a reason for hiding this comment

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

Should be
ns > 0 and 'skipClass'

@dash0002
Copy link
Owner

Can you also update test_HTMLTestRunner.py to reflect this new functionality which is optional and backward compatible?

ns should be check for a greater than 0 explicitly rather than turthiness
add skip testcase and cleanup the imports
@ghost
Copy link
Author

ghost commented Aug 20, 2016

did a few changes as you suggested.

Maybe you can checkup on the conflict and resolve those issues ?

@dash0002
Copy link
Owner

@dark-passenger I just tried to push a commit to squash the conflict, but since it's your repo, I cannot. You'll need to resolve these yourself on your branch. The code itself looks good and there's no physical conflict after your rebase. Therefore it's only a repo tracking issue caused after the rebase.

@ghost
Copy link
Author

ghost commented Oct 25, 2016

Closing pull request will resolve the conflict and send a fresh request.

@ghost ghost closed this Oct 25, 2016
@ghost ghost reopened this Oct 25, 2016
@ghost
Copy link
Author

ghost commented Oct 25, 2016

resolved all conflicts. Should be good to go @dash0002

@ghost
Copy link
Author

ghost commented Oct 25, 2016

sorry @dash0002 for the massive commit garbage. was just trying out changing the authorship. @eestrada if this is okay with you maybe you can close the other pull request.

@dash0002 dash0002 merged commit dc18be2 into dash0002:master Oct 25, 2016
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.

3 participants