← Back to branch summary

~artmello/ubuntu-push/ubuntu-push-fix_1611848

« back to all changes in this revision

Viewing changes to server/acceptance/kit/cliloop.go

  • Committer: CI Train Bot
  • Author(s): Ricardo Salveti de Araujo
  • Date: 2015-04-30 15:08:54 UTC
  • mfrom: (145.1.2 ubuntu-push)
  • Revision ID: ci-train-bot@canonical.com-20150430150854-2u38lu0oi8rtomo1
[ Samuele Pedroni ]
* switch poller to use killswitch state for WLAN instead of misleading NM property (LP: #1446584)
* don't have goroutines from a previous test overlap with the next, races gets detected otherwise
* have the TestDialWorksDirect* tests quickly timeout, go1.3 wants a ServerName set in the tls config for them to work
* fix flaky test
* support sha384/512 certs, some exercizing of that
* let send a build number with acceptanceclient
* add helper to get int out of ConnectMsg Info
Approved by: Samuele Pedroni

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/acceptance/kit/cliloop.go
45
45
        ReportPings  bool   `json:"reportPings" help:"report each Ping from the server"`
46
46
        DeviceModel  string `json:"model" help:"device image model"`
47
47
        ImageChannel string `json:"imageChannel" help:"image channel"`
 
48
        BuildNumber  int32  `json:"buildNumber" help:"build number"`
48
49
}
49
50
 
50
51
func (cfg *Configuration) PickByTarget(what, productionValue, stagingValue string) (value string) {
75
76
                "reportPings":      true,
76
77
                "model":            "?",
77
78
                "imageChannel":     "?",
 
79
                "buildNumber":      -1,
78
80
        }
79
81
)
80
82
 
112
114
                // flags
113
115
                Model:        cfg.DeviceModel,
114
116
                ImageChannel: cfg.ImageChannel,
 
117
                BuildNumber:  cfg.BuildNumber,
115
118
                ReportPings:  cfg.ReportPings,
116
119
        }
117
120
        cfgDir := filepath.Dir(flag.Lookup("cfg@").Value.String())