vbatts/go-omaha
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #13 from philips/add-machineid-field

Browse source 
feat(omaha): add a machineid field
This commit is contained in:
Brandon Philips 2014-03-17 14:32:13 -07:00
commit 40e2aba4c3
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fixtures/update-engine/update/request.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<request protocol="3.0" version="ChromeOSUpdateEngine-0.1.0.0" updaterversion="ChromeOSUpdateEngine-0.1.0.0" installsource="ondemandupdate" ismachine="1"> <request protocol="3.0" version="ChromeOSUpdateEngine-0.1.0.0" updaterversion="ChromeOSUpdateEngine-0.1.0.0" installsource="ondemandupdate" ismachine="1">
<os version="Indy" platform="Chrome OS" sp="ForcedUpdate_x86_64"></os> <os version="Indy" platform="Chrome OS" sp="ForcedUpdate_x86_64"></os>
<app appid="{87efface-864d-49a5-9bb3-4b050a7c227a}" bootid="{7D52A1CC-7066-40F0-91C7-7CB6A871BFDE}" previousbootid="{8BDE4C4D-9083-4D61-B41C-3253212C0C37}" oem="ec3000" version="ForcedUpdate" track="dev-channel" from_track="developer-build" lang="en-US" board="amd64-generic" hardware_class="" delta_okay="false" > <app appid="{87efface-864d-49a5-9bb3-4b050a7c227a}" bootid="{7D52A1CC-7066-40F0-91C7-7CB6A871BFDE}" machineid="{8BDE4C4D-9083-4D61-B41C-3253212C0C37}" oem="ec3000" version="ForcedUpdate" track="dev-channel" from_track="developer-build" lang="en-US" board="amd64-generic" hardware_class="" delta_okay="false" >
<ping active="1" a="-1" r="-1"></ping> <ping active="1" a="-1" r="-1"></ping>
<updatecheck targetversionprefix=""></updatecheck> <updatecheck targetversionprefix=""></updatecheck>
<event eventtype="3" eventresult="2" previousversion=""></event> <event eventtype="3" eventresult="2" previousversion=""></event>

2
omaha/omaha.go
View file

@ -85,7 +85,7 @@ type App struct {
// coreos update engine extensions // coreos update engine extensions
BootId string `xml:"bootid,attr,omitempty"` BootId string `xml:"bootid,attr,omitempty"`
PreviousBootId string `xml:"previousbootid,attr,omitempty"` MachineID string `xml:"machineid,attr,omitempty"`
OEM string `xml:"oem,attr,omitempty"` OEM string `xml:"oem,attr,omitempty"`
} }

4
omaha/omaha_test.go
View file

@ -32,8 +32,8 @@ func TestOmahaRequestUpdateCheck(t *testing.T) {
t.Error("Expected a Boot Id") t.Error("Expected a Boot Id")
} }
if v.Apps[0].PreviousBootId != "{8BDE4C4D-9083-4D61-B41C-3253212C0C37}" { if v.Apps[0].MachineID != "{8BDE4C4D-9083-4D61-B41C-3253212C0C37}" {
t.Error("Expected a Previous Boot Id") t.Error("Expected a MachineId")
} }
if v.Apps[0].OEM != "ec3000" { if v.Apps[0].OEM != "ec3000" {