From 5140f37b408b1a1d60eec188090f0a90e94bc733 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Tue, 2 Jul 2013 09:41:53 -0700 Subject: [PATCH 1/2] feat(omaha): add Track field this is another update_engine extension. Add it. --- fixtures/update-engine/update/request.xml | 2 +- omaha/omaha.go | 1 + omaha/omaha_test.go | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/fixtures/update-engine/update/request.xml b/fixtures/update-engine/update/request.xml index 6510544..c1f8243 100644 --- a/fixtures/update-engine/update/request.xml +++ b/fixtures/update-engine/update/request.xml @@ -1,7 +1,7 @@ - + diff --git a/omaha/omaha.go b/omaha/omaha.go index 24cb4e6..387ed88 100644 --- a/omaha/omaha.go +++ b/omaha/omaha.go @@ -77,6 +77,7 @@ type App struct { Lang string `xml:"lang,attr,omitempty"` Client string `xml:"client,attr,omitempty"` InstallAge string `xml:"installage,attr,omitempty"` + Track string `xml:"track,attr,omitempty"` FromTrack string `xml:"from_track,attr,omitempty"` Status string `xml:"status,attr,omitempty"` } diff --git a/omaha/omaha_test.go b/omaha/omaha_test.go index 594d69c..2b98a9a 100644 --- a/omaha/omaha_test.go +++ b/omaha/omaha_test.go @@ -40,6 +40,10 @@ func TestOmahaRequestUpdateCheck(t *testing.T) { t.Error("developer-build") } + if v.Apps[0].Track != "dev-channel" { + t.Error("dev-channel") + } + if v.Apps[0].Events[0].Type != "3" { t.Error("developer-build") } From ac9df07313c988b1f59f2a1239260d3c7aae9de5 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Tue, 2 Jul 2013 09:47:19 -0700 Subject: [PATCH 2/2] chore(omaha): group the update engine extensions together --- omaha/omaha.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/omaha/omaha.go b/omaha/omaha.go index 387ed88..e15e95b 100644 --- a/omaha/omaha.go +++ b/omaha/omaha.go @@ -77,9 +77,11 @@ type App struct { Lang string `xml:"lang,attr,omitempty"` Client string `xml:"client,attr,omitempty"` InstallAge string `xml:"installage,attr,omitempty"` + Status string `xml:"status,attr,omitempty"` + + // update engine extensions Track string `xml:"track,attr,omitempty"` FromTrack string `xml:"from_track,attr,omitempty"` - Status string `xml:"status,attr,omitempty"` } func NewApp(id string) *App {