Fixing tests after adding v3 swift auth

This commit is contained in:
Einar Forselv
2016-09-14 20:53:01 +02:00
parent 511fb439ac
commit 8e62620880
2 changed files with 7 additions and 3 deletions
+3 -3
View File
@@ -34,10 +34,10 @@ func (s *PublishedStorageSuite) SetUpTest(c *C) {
c.Assert(err, IsNil) c.Assert(err, IsNil)
c.Assert(s.srv, NotNil) c.Assert(s.srv, NotNil)
s.storage, err = NewPublishedStorage("swifttest", "swifttest", s.AuthURL, "", "", "test", "") s.storage, err = NewPublishedStorage("swifttest", "swifttest", s.AuthURL, "", "", "", "", "", "", "test", "")
c.Assert(err, IsNil) c.Assert(err, IsNil)
s.prefixedStorage, err = NewPublishedStorage("swifttest", "swifttest", s.AuthURL, "", "", "test", "lala") s.prefixedStorage, err = NewPublishedStorage("swifttest", "swifttest", s.AuthURL, "", "", "", "", "", "", "test", "lala")
c.Assert(err, IsNil) c.Assert(err, IsNil)
s.storage.conn.ContainerCreate("test", nil) s.storage.conn.ContainerCreate("test", nil)
@@ -48,7 +48,7 @@ func (s *PublishedStorageSuite) TearDownTest(c *C) {
} }
func (s *PublishedStorageSuite) TestNewPublishedStorage(c *C) { func (s *PublishedStorageSuite) TestNewPublishedStorage(c *C) {
stor, err := NewPublishedStorage("swifttest", "swifttest", s.AuthURL, "", "", "", "") stor, err := NewPublishedStorage("swifttest", "swifttest", s.AuthURL, "", "", "", "", "", "", "", "")
c.Check(stor, NotNil) c.Check(stor, NotNil)
c.Check(err, IsNil) c.Check(err, IsNil)
} }
+4
View File
@@ -88,6 +88,10 @@ func (s *ConfigSuite) TestSaveConfig(c *C) {
" \"authurl\": \"\",\n"+ " \"authurl\": \"\",\n"+
" \"tenant\": \"\",\n"+ " \"tenant\": \"\",\n"+
" \"tenantid\": \"\",\n"+ " \"tenantid\": \"\",\n"+
" \"domain\": \"\",\n"+
" \"domainid\": \"\",\n"+
" \"tenantdomain\": \"\",\n"+
" \"tenantdomainid\": \"\",\n"+
" \"prefix\": \"\",\n"+ " \"prefix\": \"\",\n"+
" \"container\": \"repo\"\n"+ " \"container\": \"repo\"\n"+
" }\n"+ " }\n"+