Skip to content

Commit

Permalink
bump librdkafka to 0.9.4, bump go dependencies, fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
felipejfc committed Mar 31, 2017
1 parent 53277d4 commit bb37767
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
sudo: true
env:
matrix:
- LIBRDKAFKA_VERSION=v0.9.3
- LIBRDKAFKA_VERSION=v0.9.4
- LIBRDKAFKA_VERSION=master
global:
secure: dm9+XwwQk759cpVpleBjHhtbbe5s3LNjz9wwMGa3DEENFAMiX4HjJSmfyvV8D3t0NdicDJrYW4HdTIqacneIOFbkMEYA4RmwdxBe4NcJQC6es/8I+EL52/EKmwKwtnkvsQFrQkJmzS1JYKNQb73bWY4huTGNxYiUiX9xfK3sO+X9xi62eN/xpOVaSbIwB44h5oNEj7/aaeQEvsqg69eO5hRsCdIRWXxTyP37GdMupC4vtE6A5uU8LdGzE4f0dP5JKxmL53s0fCM0kqjP1ycIOwjhlqWdo+BjRBAKpE8cM4p/BnzM+rCWNyjt333Kxjwp42FBnfaYiEET1f0xN43h2rfZRHvCoL3ATGev2aDzGMhsOuqHLfVRFt7u/9QynZltApctsmEMMYXDY6a9TsbcE6UjC7GG4HTIOO/PmWyburL18aTicCWLUvbKhljG7873sAwZchrtCxXxyBkd6zjHznciwljbVvexMlWhaO269C++u95fdEUO2pkidDNkrnf5TjYJnGJGcyBvXAvkGdZrxiOwV3pxH1mfb7D87tvzo60XRf3/7++Un8iggFb9+Ppd35eYCnpNmEP95IhKigkJ6hMY5Al8ARpQ+JA6EwTqMPZf+r5RiAq4uxOeYK0rEiWDY7RxqlPPW7AGdoyy/OJ1LgbCdZssZs+Ig4JWViwdTWg=
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ MAINTAINER TFG Co <backend@tfgco.com>
RUN apk update
RUN apk add make git g++ bash python wget

ENV LIBRDKAFKA_VERSION 0.9.3
ENV LIBRDKAFKA_VERSION 0.9.4
RUN wget -O /root/librdkafka-${LIBRDKAFKA_VERSION}.tar.gz https://github.com/edenhill/librdkafka/archive/v${LIBRDKAFKA_VERSION}.tar.gz && \
tar -xzf /root/librdkafka-${LIBRDKAFKA_VERSION}.tar.gz -C /root && \
cd /root/librdkafka-${LIBRDKAFKA_VERSION} && \
Expand Down
3 changes: 1 addition & 2 deletions extensions/apns_message_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ var _ = Describe("APNS Message Handler", func() {
var statsClients []interfaces.StatsReporter

configFile := "../config/test.yaml"
config, err := util.NewViperWithConfigFile(configFile)
Expect(err).NotTo(HaveOccurred())
config, _ := util.NewViperWithConfigFile(configFile)
certificatePath := "../tls/self_signed_cert.pem"
isProduction := false
logger, hook := test.NewNullLogger()
Expand Down
3 changes: 1 addition & 2 deletions extensions/gcm_message_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ var _ = Describe("GCM Message Handler", func() {
var statsClients []interfaces.StatsReporter

configFile := "../config/test.yaml"
config, err := util.NewViperWithConfigFile(configFile)
Expect(err).NotTo(HaveOccurred())
config, _ := util.NewViperWithConfigFile(configFile)
senderID := "sender-id"
apiKey := "api-key"
isProduction := false
Expand Down
4 changes: 1 addition & 3 deletions extensions/timeout_heap_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ import (

var _ = Describe("[Unit]", func() {
configFile := "../config/test.yaml"
config, err := util.NewViperWithConfigFile(configFile)

Expect(err).NotTo(HaveOccurred())
config, _ := util.NewViperWithConfigFile(configFile)

Describe("TimeoutHeap", func() {
It("should push a new timeout node to heap", func() {
Expand Down
60 changes: 37 additions & 23 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion util/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ var _ = Describe("Config", func() {
It("should panic if path is invalid", func() {
config, err := NewViperWithConfigFile("")
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(Equal("Config File \"config\" Not Found in \"[]\""))
Expect(err.Error()).To(Equal("Unsupported Config Type \"\""))
Expect(config).To(BeNil())
})
})
Expand Down

0 comments on commit bb37767

Please sign in to comment.