Merge lp:~elopio/snappy/fix_info_test into lp:~snappy-dev/snappy/snappy-moved-to-github

Proposed by Leo Arias
Status: Merged
Approved by: Federico Gimenez
Approved revision: 613
Merged at revision: 613
Proposed branch: lp:~elopio/snappy/fix_info_test
Merge into: lp:~snappy-dev/snappy/snappy-moved-to-github
Diff against target: 25 lines (+4/-3)
1 file modified
_integration-tests/helpers/common/common.go (+4/-3)
To merge this branch: bzr merge lp:~elopio/snappy/fix_info_test
Reviewer Review Type Date Requested Status
Federico Gimenez (community) Approve
Review via email: mp+266014@code.launchpad.net

Commit message

Fix the assign to the global integration tests config.

To post a comment you must log in.
Revision history for this message
Leo Arias (elopio) wrote :

we were doing a local assignment, so the info test never get the config we read on the setup.

lp:~elopio/snappy/fix_info_test updated
613. By Leo Arias

Fixed typo.

Revision history for this message
Federico Gimenez (fgimenez) wrote :

Thanks! :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '_integration-tests/helpers/common/common.go'
--- _integration-tests/helpers/common/common.go 2015-07-24 16:39:21 +0000
+++ _integration-tests/helpers/common/common.go 2015-07-27 17:41:09 +0000
@@ -41,9 +41,9 @@
41 channelCfgFile = "/etc/system-image/channel.ini"41 channelCfgFile = "/etc/system-image/channel.ini"
42)42)
4343
44// Cfg is a struct that contains the configurations values passed from the44// Cfg is a struct that contains the configuration values passed from the
45// host to the testbed.45// host to the testbed.
46var Cfg config.Config46var Cfg *config.Config
4747
48// SnappySuite is a structure used as a base test suite for all the snappy48// SnappySuite is a structure used as a base test suite for all the snappy
49// integration tests.49// integration tests.
@@ -57,7 +57,8 @@
57 ExecCommand(c, "sudo", "systemctl", "stop", "snappy-autopilot.timer")57 ExecCommand(c, "sudo", "systemctl", "stop", "snappy-autopilot.timer")
58 ExecCommand(c, "sudo", "systemctl", "disable", "snappy-autopilot.timer")58 ExecCommand(c, "sudo", "systemctl", "disable", "snappy-autopilot.timer")
59 if !isInRebootProcess() {59 if !isInRebootProcess() {
60 Cfg, err := config.ReadConfig(60 var err error
61 Cfg, err = config.ReadConfig(
61 "_integration-tests/data/output/testconfig.json")62 "_integration-tests/data/output/testconfig.json")
62 c.Assert(err, check.IsNil, check.Commentf("Error reading config: %v", err))63 c.Assert(err, check.IsNil, check.Commentf("Error reading config: %v", err))
63 if Cfg.Update || Cfg.Rollback {64 if Cfg.Update || Cfg.Rollback {

Subscribers

People subscribed via source and target branches