Join GitHub today
GitHub is home to over 20 million developers working together to host and review code, manage projects, and build software together.
Removed old storage from tests. #4761
Conversation
wallyworld
reviewed
Mar 21, 2016
| @@ -333,12 +331,16 @@ func (s *toolsSuite) TestDownloadTopLevelPath(c *gc.C) { | ||
| s.testDownload(c, tools, "") | ||
| } | ||
| +/* |
wallyworld
reviewed
Mar 21, 2016
| @@ -183,7 +182,7 @@ var upgradeJujuTests = []struct { | ||
| currentVersion: "3.0.0-quantal-amd64", | ||
| agentVersion: "3.0.0", | ||
| args: []string{"--version", "3.2.0"}, | ||
| - expectErr: "no tools available", | ||
| + expectErr: "no matching tools available", |
wallyworld
Mar 21, 2016
Owner
these are different errors - i am concerned the new code is not returning the original error
wallyworld
reviewed
Mar 21, 2016
| @@ -318,18 +317,16 @@ func (s *UpgradeJujuSuite) TestUpgradeJuju(c *gc.C) { | ||
| com := newUpgradeJujuCommand(test.upgradeMap) | ||
| if err := coretesting.InitCommand(com, test.args); err != nil { | ||
| if test.expectInitErr != "" { | ||
| - c.Check(err, gc.ErrorMatches, test.expectInitErr) | ||
| + c.Assert(err, gc.ErrorMatches, test.expectInitErr) |
wallyworld
reviewed
Mar 21, 2016
| + versions, err := stor.AllMetadata() | ||
| + for _, v := range versions { | ||
| + err := stor.Remove(v.Version) | ||
| + //c.Assert(err, jc.ErrorIsNil) |
wallyworld
reviewed
Mar 21, 2016
| - versions := make([]version.Binary, len(tools)) | ||
| - for i, v := range tools { | ||
| - versions[i], err = version.ParseBinary(v) | ||
| + // versions := make([]version.Binary, len(tools)) |
wallyworld
reviewed
Mar 21, 2016
| if err != nil { | ||
| c.Assert(err, jc.Satisfies, series.IsUnknownOSForSeriesError) | ||
| + continue |
wallyworld
reviewed
Mar 21, 2016
| @@ -866,7 +866,7 @@ func (s *BootstrapSuite) makeTestEnv(c *gc.C) { | ||
| c.Assert(err, jc.ErrorIsNil) | ||
| s.PatchValue(&juju.JujuPublicKey, sstesting.SignedMetadataPublicKey) | ||
| - envtesting.MustUploadFakeTools(s.toolsStorage, cfg.AgentStream(), cfg.AgentStream()) | ||
| + envtesting.MustUploadFakeToolsToSimpleStreams(s.toolsStorage, cfg.AgentStream(), cfg.AgentStream()) |
wallyworld
Mar 21, 2016
Owner
can we also then call s.toolStorage "s.simplestreamsToolsStorage" to disambiguate from tools storage used elsewhere
wallyworld
reviewed
Mar 21, 2016
| @@ -56,8 +56,11 @@ func (s *bootstrapSuite) SetUpTest(c *gc.C) { | ||
| s.PatchValue(&envtools.DefaultBaseURL, storageDir) | ||
| stor, err := filestorage.NewFileStorageWriter(storageDir) | ||
| c.Assert(err, jc.ErrorIsNil) | ||
| + // Upload tools to both release and devel streams since config will dictate that we |
wallyworld
reviewed
Mar 21, 2016
| - t, err := uploadFakeToolsVersion(stor, toolsDir, version) | ||
| + meta, err := stor.Metadata(version) | ||
| + ctool := &coretools.Tools{ | ||
| + Version: meta.Version, |
wallyworld
Mar 21, 2016
Owner
this doesn't look right - how can we expect meta to be valid if err != nil
wallyworld
reviewed
Mar 21, 2016
wallyworld
reviewed
Mar 21, 2016
| - s.CommonProvisionerSuite.PatchValue(&tools.DefaultBaseURL, storageDir) | ||
| - stor, err := filestorage.NewFileStorageWriter(storageDir) | ||
| - c.Assert(err, jc.ErrorIsNil) | ||
| + //storageDir := c.MkDir() |
perrito666
closed this
Mar 23, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
perrito666 commentedMar 16, 2016
No description provided.