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.

Sign up for GitHub

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

Jump to bottom

refactored test-cmd/edit to use new helper methods #6012

Merged
merged 2 commits into from
Nov 23, 2015
Merged

refactored test-cmd/edit to use new helper methods #6012

merged 2 commits into from
Nov 23, 2015

Conversation

stevekuznetsov
Copy link
Contributor

@deads2k
Copy link
Contributor

deads2k commented Nov 23, 2015

[test]

@deads2k deads2k self-assigned this Nov 23, 2015
stevekuznetsov
stevekuznetsov reviewed Nov 23, 2015
View reviewed changes
test/cmd/edit.sh

[ "$(OC_EDITOR=cat oc edit pod/hello-openshift 2>&1 | grep 'Edit cancelled')" ]
Copy link
Contributor Author

Choose a reason for hiding this comment

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

2>&1 is not necessary any longer, as it was previously used for the grep and the helper methods implicitly will check both stdout and stderr for the desired text.

@stevekuznetsov
Copy link
Contributor Author

I've never seen this before...

!!! Error in test/cmd/../../hack/text.sh:53
    'tput setaf 2' exited with status 1

@liggitt this command is used in test-integration here, right? Do you know why this would fail?

@stevekuznetsov stevekuznetsov force-pushed the skuznets/refactor-test-cmd-edit branch 2 times, most recently from ac80dd8 to 4221622 Compare November 23, 2015 17:51
@stevekuznetsov
Copy link
Contributor Author

Changed hack/text.sh to use functions instead of aliases, added a TTY-check. If this works I'll break that commit out into a separate pull.
re[test]

@stevekuznetsov stevekuznetsov mentioned this pull request Nov 23, 2015
Closed
@stevekuznetsov
Copy link
Contributor Author

Tagging @Kargakis for review - please review that we are expecting success and/or failure correctly, as the exit codes were masked previously with the grep afterword.

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 4221622

@deads2k
Copy link
Contributor

deads2k commented Nov 23, 2015

lgtm [merge]

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_origin/4118/) (Image: devenv-rhel7_2782)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 4221622

@stevekuznetsov stevekuznetsov mentioned this pull request Nov 23, 2015
Merged
@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/7369/)

openshift-bot pushed a commit that referenced this pull request Nov 23, 2015
Merge pull request #6012 from stevekuznetsov/skuznets/refactor-test-c…
7c155b5 
…md-edit

Merged by openshift-bot
@openshift-bot openshift-bot merged commit 7c155b5 into openshift:master Nov 23, 2015
@stevekuznetsov stevekuznetsov deleted the skuznets/refactor-test-cmd-edit branch January 8, 2016 15:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@deads2k deads2k

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@stevekuznetsov @deads2k @openshift-bot