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

Ticket/11045 Add unit tests for the compress class #976

Merged
merged 6 commits into from Sep 13, 2012

Conversation

Fyorl
Copy link
Contributor

@Fyorl Fyorl commented Aug 28, 2012

*
*/

require_once __DIR__ . '/../../phpBB/includes/functions.php';
Copy link
Collaborator

Choose a reason for hiding this comment

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

should be dirname(__FILE__)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Are you sure? naderman told me to use __DIR__ here: #857 (comment)

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yes. There is no __DIR__ on PHP 5.2 and Olympus support 5.2. Develop doesn't, so it should be __DIR__ there.

Copy link
Collaborator

Choose a reason for hiding this comment

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

@travisbot
Copy link

This pull request fails (merged 94c9d70 into 4db4731).

@bantu
Copy link
Collaborator

bantu commented Aug 29, 2012

Some tests seem to fail. See http://travis-ci.org/#!/phpbb/phpbb3/jobs/2259194

@travisbot
Copy link

This pull request fails (merged 0d23b9de into 4db4731).

@Fyorl
Copy link
Contributor Author

Fyorl commented Sep 1, 2012

I believe the tests are failing because the file conflict handling that was added to the compress class was not added to develop-olympus but only develop. I can create a new ticket + PR with a cherry-pick of the file conflict handling into develop-olympus?

@travisbot
Copy link

This pull request fails (merged 1520130 into 4db4731).

@bantu
Copy link
Collaborator

bantu commented Sep 2, 2012

Hmm, right, in this case, we'll either just have this on develop only (the old patch) or you'll have to split the tests up into multiple patches.

@p
Copy link
Contributor

p commented Sep 6, 2012

My vote is for splitting to achieve maximum test coverage everywhere.

@imkingdavid
Copy link
Contributor

@p I agree.

@Fyorl
Copy link
Contributor Author

Fyorl commented Sep 10, 2012

No problem, I'll split it.

@bantu bantu merged commit ce7cffc into phpbb:develop-olympus Sep 13, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants