integration-tests: run the installed snappy when there is no config file #614

Merged
merged 2 commits into from Mar 9, 2016
Jump to file or symbol
Failed to load files and symbols.
+6 −4
Split
@@ -50,11 +50,13 @@ func init() {
cli.ExecCommand(c, "sudo", "systemctl", "stop", "snappy-autopilot.timer")
cli.ExecCommand(c, "sudo", "systemctl", "disable", "snappy-autopilot.timer")
- cfg, err := config.ReadConfig(config.DefaultFileName)
- c.Assert(err, check.IsNil, check.Commentf("Error reading config: %v", err))
+ if _, err := os.Stat(config.DefaultFileName); err == nil {
+ cfg, err := config.ReadConfig(config.DefaultFileName)
+ c.Assert(err, check.IsNil, check.Commentf("Error reading config: %v", err))
- if cfg.FromBranch {
- setUpSnapdFromBranch(c)
+ if cfg.FromBranch {
+ setUpSnapdFromBranch(c)
+ }
}
}