Skip to content

Commit 53d63d6

Browse files
mvo5mvo5
committed
many: run gofmt to match go-1.13
1 parent 5cf3003 commit 53d63d6

File tree

7 files changed

+85
-85
lines changed

7 files changed

+85
-85
lines changed

‎asserts/account_key_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@ func (aks *accountKeySuite) TestAccountKeyRequestUntil(c *C) {
831831
untilHeader string
832832
until time.Time
833833
}{
834-
{"", time.Time{}}, // zero time default
834+
{"", time.Time{}}, // zero time default
835835
{aks.until.Format(time.RFC3339), aks.until}, // in the future
836836
{aks.since.Format(time.RFC3339), aks.since}, // same as since
837837
}

‎interfaces/policy/basedeclaration_test.go

+56-56
Original file line numberDiff line numberDiff line change
@@ -584,53 +584,53 @@ plugs:
584584
var (
585585
slotInstallation = map[string][]string{
586586
// other
587-
"adb-support": {"core"},
588-
"audio-playback": {"app", "core"},
589-
"audio-record": {"app", "core"},
590-
"autopilot-introspection": {"core"},
591-
"avahi-control": {"app", "core"},
592-
"avahi-observe": {"app", "core"},
593-
"bluez": {"app", "core"},
594-
"bool-file": {"core", "gadget"},
595-
"browser-support": {"core"},
596-
"content": {"app", "gadget"},
597-
"core-support": {"core"},
598-
"cups": {"app"},
599-
"cups-control": {"app", "core"},
600-
"dbus": {"app"},
601-
"docker-support": {"core"},
602-
"desktop-launch": {"core"},
603-
"dsp": {"core", "gadget"},
604-
"dummy": {"app"},
605-
"fwupd": {"app", "core"},
606-
"gpio": {"core", "gadget"},
607-
"gpio-control": {"core"},
608-
"greengrass-support": {"core"},
609-
"hidraw": {"core", "gadget"},
610-
"i2c": {"core", "gadget"},
611-
"iio": {"core", "gadget"},
612-
"kubernetes-support": {"core"},
613-
"location-control": {"app"},
614-
"location-observe": {"app"},
615-
"lxd-support": {"core"},
616-
"maliit": {"app"},
617-
"media-hub": {"app", "core"},
618-
"mir": {"app"},
619-
"modem-manager": {"app", "core"},
620-
"mpris": {"app"},
621-
"netlink-driver": {"core", "gadget"},
622-
"network-manager": {"app", "core"},
623-
"network-manager-observe": {"app", "core"},
624-
"network-status": {"core"},
625-
"ofono": {"app", "core"},
626-
"online-accounts-service": {"app"},
627-
"power-control": {"core"},
628-
"ppp": {"core"},
629-
"pulseaudio": {"app", "core"},
630-
"pwm": {"core", "gadget"},
631-
"raw-volume": {"core", "gadget"},
632-
"serial-port": {"core", "gadget"},
633-
"spi": {"core", "gadget"},
587+
"adb-support": {"core"},
588+
"audio-playback": {"app", "core"},
589+
"audio-record": {"app", "core"},
590+
"autopilot-introspection": {"core"},
591+
"avahi-control": {"app", "core"},
592+
"avahi-observe": {"app", "core"},
593+
"bluez": {"app", "core"},
594+
"bool-file": {"core", "gadget"},
595+
"browser-support": {"core"},
596+
"content": {"app", "gadget"},
597+
"core-support": {"core"},
598+
"cups": {"app"},
599+
"cups-control": {"app", "core"},
600+
"dbus": {"app"},
601+
"docker-support": {"core"},
602+
"desktop-launch": {"core"},
603+
"dsp": {"core", "gadget"},
604+
"dummy": {"app"},
605+
"fwupd": {"app", "core"},
606+
"gpio": {"core", "gadget"},
607+
"gpio-control": {"core"},
608+
"greengrass-support": {"core"},
609+
"hidraw": {"core", "gadget"},
610+
"i2c": {"core", "gadget"},
611+
"iio": {"core", "gadget"},
612+
"kubernetes-support": {"core"},
613+
"location-control": {"app"},
614+
"location-observe": {"app"},
615+
"lxd-support": {"core"},
616+
"maliit": {"app"},
617+
"media-hub": {"app", "core"},
618+
"mir": {"app"},
619+
"modem-manager": {"app", "core"},
620+
"mpris": {"app"},
621+
"netlink-driver": {"core", "gadget"},
622+
"network-manager": {"app", "core"},
623+
"network-manager-observe": {"app", "core"},
624+
"network-status": {"core"},
625+
"ofono": {"app", "core"},
626+
"online-accounts-service": {"app"},
627+
"power-control": {"core"},
628+
"ppp": {"core"},
629+
"pulseaudio": {"app", "core"},
630+
"pwm": {"core", "gadget"},
631+
"raw-volume": {"core", "gadget"},
632+
"serial-port": {"core", "gadget"},
633+
"spi": {"core", "gadget"},
634634
"storage-framework-service": {"app"},
635635
"thumbnailer-service": {"app"},
636636
"ubuntu-download-manager": {"app"},
@@ -760,15 +760,15 @@ func (s *baseDeclSuite) TestConnection(c *C) {
760760
// connecting with these interfaces needs to be allowed on
761761
// case-by-case basis
762762
noconnect := map[string]bool{
763-
"content": true,
764-
"cups": true,
765-
"docker": true,
766-
"fwupd": true,
767-
"location-control": true,
768-
"location-observe": true,
769-
"lxd": true,
770-
"maliit": true,
771-
"mir": true,
763+
"content": true,
764+
"cups": true,
765+
"docker": true,
766+
"fwupd": true,
767+
"location-control": true,
768+
"location-observe": true,
769+
"lxd": true,
770+
"maliit": true,
771+
"mir": true,
772772
"online-accounts-service": true,
773773
"raw-volume": true,
774774
"storage-framework-service": true,

‎osutil/udev/netlink/uevent_test.go

+16-16
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func TestParseUdevEvent(testing *testing.T) {
9292
Action: REMOVE,
9393
KObj: "/devices/pci0000:00/0000:00:14.0/usb1/1-2/1-2:1.0/ttyUSB0/tty/ttyUSB0",
9494
Env: map[string]string{
95-
"MINOR": "0",
95+
"MINOR": "0",
9696
"ID_PCI_CLASS_FROM_DATABASE": "Serial bus controller",
9797
"ID_PCI_SUBCLASS_FROM_DATABASE": "USB controller",
9898
"ID_VENDOR_FROM_DATABASE": "Future Technology Devices International, Ltd",
@@ -137,21 +137,21 @@ func TestParseUdevEvent(testing *testing.T) {
137137
Action: ADD,
138138
KObj: "/devices/pci0000:00/0000:00:14.0/usb1/1-2",
139139
Env: map[string]string{
140-
"DEVTYPE": "usb_device",
141-
"SEQNUM": "4410",
142-
"DRIVER": "usb",
143-
"DEVPATH": "/devices/pci0000:00/0000:00:14.0/usb1/1-2",
144-
"SUBSYSTEM": "usb",
145-
"BUSNUM": "001",
146-
"ID_USB_INTERFACES": ":ff0000:",
147-
"USEC_INITIALIZED": "77155422759",
148-
"ID_VENDOR_ENC": "Silicon\\x20Labs",
149-
"ID_VENDOR_ID": "10c4",
150-
"ID_SERIAL": "Silicon_Labs_CP2102_USB_to_UART_Bridge_Controller_0001",
151-
"ACTION": "add",
152-
"DEVNAME": "/dev/bus/usb/001/033",
153-
"MAJOR": "189",
154-
"ID_MODEL_FROM_DATABASE": "CP2102/CP2109 UART Bridge Controller [CP210x family]",
140+
"DEVTYPE": "usb_device",
141+
"SEQNUM": "4410",
142+
"DRIVER": "usb",
143+
"DEVPATH": "/devices/pci0000:00/0000:00:14.0/usb1/1-2",
144+
"SUBSYSTEM": "usb",
145+
"BUSNUM": "001",
146+
"ID_USB_INTERFACES": ":ff0000:",
147+
"USEC_INITIALIZED": "77155422759",
148+
"ID_VENDOR_ENC": "Silicon\\x20Labs",
149+
"ID_VENDOR_ID": "10c4",
150+
"ID_SERIAL": "Silicon_Labs_CP2102_USB_to_UART_Bridge_Controller_0001",
151+
"ACTION": "add",
152+
"DEVNAME": "/dev/bus/usb/001/033",
153+
"MAJOR": "189",
154+
"ID_MODEL_FROM_DATABASE": "CP2102/CP2109 UART Bridge Controller [CP210x family]",
155155
"TYPE": "0/0/0",
156156
"ID_REVISION": "0100",
157157
"ID_BUS": "usb",

‎overlord/assertstate/assertstate_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@ func (s *assertMgrSuite) SetUpTest(c *C) {
264264
s.o.AddManager(s.o.TaskRunner())
265265

266266
s.fakeStore = &fakeStore{
267-
state: s.state,
268-
db: s.storeSigning,
267+
state: s.state,
268+
db: s.storeSigning,
269269
maxDeclSupportedFormat: asserts.SnapDeclarationType.MaxSupportedFormat(),
270270
maxValidationSetSupportedFormat: asserts.ValidationSetType.MaxSupportedFormat(),
271271
}

‎overlord/servicestate/service_control_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -1028,13 +1028,13 @@ func (s *serviceControlSuite) TestUpdateSnapstateServices(c *C) {
10281028
changed: false,
10291029
},
10301030
{
1031-
enable: []string{"a"},
1031+
enable: []string{"a"},
10321032
expectedSnapstateEnabled: []string{"a"},
10331033
changed: true,
10341034
},
10351035
// enable again does nothing
10361036
{
1037-
enable: []string{"a"},
1037+
enable: []string{"a"},
10381038
expectedSnapstateEnabled: []string{"a"},
10391039
changed: false,
10401040
},
@@ -1044,7 +1044,7 @@ func (s *serviceControlSuite) TestUpdateSnapstateServices(c *C) {
10441044
changed: true,
10451045
},
10461046
{
1047-
enable: []string{"a", "c"},
1047+
enable: []string{"a", "c"},
10481048
expectedSnapstateEnabled: []string{"a", "c"},
10491049
changed: true,
10501050
},

‎overlord/snapstate/autorefresh_gating_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -237,20 +237,20 @@ func (s *autorefreshGatingSuite) TestHoldDurationLeft(c *C) {
237237
{
238238
"2021-05-03T10:00:00Z", // last refreshed (1 month ago)
239239
"2021-06-03T10:00:00Z", // first held now
240-
"48h", // max duration
241-
"48h", // expected
240+
"48h", // max duration
241+
"48h", // expected
242242
},
243243
{
244244
"2021-05-03T10:00:00Z", // last refreshed (1 month ago)
245245
"2021-06-02T10:00:00Z", // first held (1 day ago)
246-
"48h", // max duration
247-
"24h", // expected
246+
"48h", // max duration
247+
"24h", // expected
248248
},
249249
{
250250
"2021-05-03T10:00:00Z", // last refreshed (1 month ago)
251251
"2021-06-01T10:00:00Z", // first held (2 days ago)
252-
"48h", // max duration
253-
"00h", // expected
252+
"48h", // max duration
253+
"00h", // expected
254254
},
255255
{
256256
"2021-03-08T10:00:00Z", // last refreshed (almost 3 months ago)

‎progress/ansimeter_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func (ansiSuite) TestFinish(c *check.C) {
8787
p := &progress.ANSIMeter{}
8888
p.Finished()
8989
c.Check(buf.String(), check.Equals, fmt.Sprint(
90-
"\r", // move cursor to start of line
90+
"\r", // move cursor to start of line
9191
progress.ExitAttributeMode, // turn off color, reverse, bold, anything
9292
progress.CursorVisible, // turn the cursor back on
9393
progress.ClrEOL, // and clear the rest of the line

0 commit comments

Comments
 (0)