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

[Leo Arias]

Fix the assign to the global integration tests config.

[Leo Arias (elopio)]

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]

613. By Leo Arias on 2015-07-27

Fixed typo.

[Federico Gimenez (fgimenez)]

Thanks! :)

review: Approve

=== 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 @@
 	channelCfgFile  = "/etc/system-image/channel.ini"
 )
 
-// Cfg is a struct that contains the configurations values passed from the
+// Cfg is a struct that contains the configuration values passed from the
 // host to the testbed.
-var Cfg config.Config
+var Cfg *config.Config
 
 // SnappySuite is a structure used as a base test suite for all the snappy
 // integration tests.
@@ -57,7 +57,8 @@
 	ExecCommand(c, "sudo", "systemctl", "stop", "snappy-autopilot.timer")
 	ExecCommand(c, "sudo", "systemctl", "disable", "snappy-autopilot.timer")
 	if !isInRebootProcess() {
-		Cfg, err := config.ReadConfig(
+		var err error
+		Cfg, err = config.ReadConfig(
 			"_integration-tests/data/output/testconfig.json")
 		c.Assert(err, check.IsNil, check.Commentf("Error reading config: %v", err))
 		if Cfg.Update || Cfg.Rollback {