Feature/pn 310 sms ttl #15
Open
+132
−24
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bogh
requested review from
stefanscheidt,
fabzo,
cosminrentea and
marian-craciunescu
marian-craciunescu
requested changes
Mar 21, 2017
server/sms/nexmo_sms_sender_test.go
Outdated
| countCh := make(chan bool) | ||
| doneCh := make(chan struct{}) | ||
| // no request should be made in case the sms is expired | ||
| go dummyNexmoEndpointWithHandlerFunc(t, countCh, port, func(t *testing.T, countCh chan bool) http.HandlerFunc { |
There was a problem hiding this comment.
better way to do it.Make a new NexmoHandler and if a request reaches the http server.
a.FailNow() the request.In this way no doneCh is needed.
There was a problem hiding this comment.
You mean another function that handles it? Because we have no NexmoHandler atm.
| IsError: true, | ||
| } | ||
|
|
||
| assert.Equal(t, "!"+ERROR_BAD_REQUEST+" "+"you are so bad.", string(msg.Bytes())) |
There was a problem hiding this comment.
:) ha ha ha ..Such Badness
There was a problem hiding this comment.
That was there before. I just moved it. :))
…tea/gobbler into feature/pn-310-sms-ttl
marian-craciunescu
approved these changes
Mar 21, 2017
protocol/message.go
Outdated
| @@ -150,7 +150,7 @@ func (m *Message) SetFilter(key, value string) { | |||
| // Checks are made using `Expires` field timezone | |||
| func (m *Message) IsExpired() bool { | |||
| if m.Expires == nil { | |||
| return true | |||
| return false | |||
server/sms/nexmo_sms_sender.go
Outdated
| "Expires": msg.Expires.Format(time.RFC3339), | ||
| "Created": time.Unix(msg.Time, 0).Format(time.RFC3339), | ||
| }).Info("Expired message received") | ||
| mTotalExpiredMessages.Add(1) |
There was a problem hiding this comment.
I added a prometheus equivalent for this in another PR
server/sms/nexmo_sms_sender_test.go
Outdated
| @@ -35,3 +36,26 @@ func TestNexmoSender_SendWithError(t *testing.T) { | |||
| a.Error(err) | |||
| a.Equal(ErrRetryFailed, err) | |||
| } | |||
|
|
|||
| func TestNexmoSender_SendExpiredMessage(t *testing.T) { | |||
There was a problem hiding this comment.
minor: I moved the test to sms_integration_test.go
cosminrentea
requested review from
zeisss,
marian-craciunescu,
everesio and
robinnepomukmai
|
Changes Unknown when pulling bfc87cf on feature/pn-310-sms-ttl into ** on master**. |
… feature/pn-310-ttl-change-to-timestamp
…tea/gobbler into feature/pn-310-sms-ttl
marian-craciunescu
approved these changes
Apr 24, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR should be merged after: #7