scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-09-11 23:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ops:nuevo-pilosa

Browse source
This commit is contained in:
Todd Gruben 2013-12-03 16:26:55 -06:00
commit 8f05bdc47b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
config/config_test.go
View file

@ -12,15 +12,15 @@ func TestConfig(t *testing.T) {
t.Fatal("Error setting PILOSA_CONFIG")
}
Convey("config.Get()", t, func() {
So(Get("port_tcp").(int), ShouldEqual, 12000)
So(Get("port_http").(int), ShouldEqual, 15000)
So(Get("temp").(string), ShouldEqual, "/tmp")
So(Get("port_tcp"), ShouldEqual, 12000)
So(Get("port_http"), ShouldEqual, 15000)
So(Get("temp"), ShouldEqual, "/tmp")
So(Get("notfound"), ShouldBeNil)
})
Convey("config.GetSafe()", t, func() {
val, ok := GetSafe("port_tcp")
So(ok, ShouldBeTrue)
So(val.(int), ShouldEqual, 12000)
So(val, ShouldEqual, 12000)
val, ok = GetSafe("derp")
So(ok, ShouldBeFalse)
So(val, ShouldBeNil)

2
deps.json
View file

@ -6,7 +6,7 @@
},
"etcd": {
"repo": "github.com/coreos/go-etcd/etcd",
"version": "8a44ce0c654efd505418bb2c341cb9b797020583",
"version": "8a4461a676eb65fb74f10da1f8198cc9f67da366",
"type": "git"
},
"goconvey": {