Merge pull request #346 from cloudfoundry/fix-github-action

Fix bootstrap unit tests and run tests for pull requests
cloudfoundry · Jan 16, 2025 · 3460018 · 3460018
2 parents e03a736 + d8dab69
commit 3460018
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -1,8 +1,6 @@
 ---
 name: go
-on:
-  push:
-  pull_request:
+on: [push, pull_request]
 jobs:
   lint: # <- name
     strategy:

diff --git a/agent/bootstrap_test.go b/agent/bootstrap_test.go
@@ -1099,6 +1099,7 @@ var _ = Describe("bootstrap", func() {
 					fakesys.FakeCmdResult{Stdout: "/dev/vda1"},
 				)
 
+				logger = boshlog.NewLogger(boshlog.LevelNone)
 				udev := boshudev.NewConcreteUdevDevice(runner, logger)
 				linuxCdrom := boshcdrom.NewLinuxCdrom("/dev/sr0", udev, runner)
 				linuxCdutil := boshcdrom.NewCdUtil(dirProvider.SettingsDir(), fs, linuxCdrom, logger)
@@ -1117,7 +1118,6 @@ var _ = Describe("bootstrap", func() {
 				interfaceConfigurationCreator := boshnet.NewInterfaceConfigurationCreator(logger)
 
 				interfaceAddrsProvider = &fakeip.FakeInterfaceAddressesProvider{}
-				logger = boshlog.NewLogger(boshlog.LevelNone)
 				kernelIPv6 := boshnet.NewKernelIPv6Impl(fs, runner, logger)
 				fakeMACAddressDetector = &netfakes.FakeMACAddressDetector{}
 				err := fs.WriteFileString("/etc/resolv.conf", "8.8.8.8 4.4.4.4")
@@ -1318,6 +1318,9 @@ var _ = Describe("bootstrap", func() {
 				Context("and a single physical network interface exists", func() {
 					BeforeEach(func() {
 						stubInterfaces([][]string{{"eth0", "aa:bb:cc"}})
+						interfaceAddrsProvider.GetInterfaceAddresses = []boship.InterfaceAddress{
+							boship.NewSimpleInterfaceAddress("eth0", "2.2.2.2"),
+						}
 					})
 
 					It("succeeds", func() {