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

make timing tests actually not run under CI #1499

Merged
merged 1 commit into from
Jul 19, 2015
Merged

Conversation

whyrusleeping
Copy link
Member

we were actually ignoring the CI environment variable, and in some places werent actually checking it in a platform agnostic way.

License: MIT
Signed-off-by: Jeromy jeromyj@gmail.com

License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
@whyrusleeping whyrusleeping added the status/in-progress In progress label Jul 19, 2015
@@ -117,7 +115,7 @@ func TestDialWait(t *testing.T) {
defer s1.Close()

s1.dialT = time.Millisecond * 300 // lower timeout for tests.
if travis.IsRunning() {
if ci.IsRunning() {
Copy link
Member

Choose a reason for hiding this comment

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

these were deliberate-- i wanted them to run on jenkins / not-travis

Copy link
Member

Choose a reason for hiding this comment

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

(but since jenkins is gone...)

Copy link
Member Author

Choose a reason for hiding this comment

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

ah, do you want it changed back then?

Copy link
Member

Choose a reason for hiding this comment

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

nah, it's fine.

jbenet added a commit that referenced this pull request Jul 19, 2015
make timing tests actually not run under CI
@jbenet jbenet merged commit f5b8952 into master Jul 19, 2015
@jbenet jbenet removed the status/in-progress In progress label Jul 19, 2015
@jbenet jbenet deleted the fix/ci-test-skip branch July 19, 2015 23:26
@jbenet jbenet modified the milestone: IPFS 0.3.6 Jul 28, 2015
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

2 participants