Skip to content

Added dummy dir #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonaz merged 1 commit into from
Mar 18, 2025
Merged

Added dummy dir #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ spec:
time.Sleep(2 * time.Second)

err = os.WriteFile("./adminConfig", []byte(fmt.Sprintf(`
{"masters":[{"name":"http://localhost:%s","zone":"zone1"}],
{"masters":[{"name":"http://127.0.0.1:%s","zone":"zone1"}],
"token":"%s"}`, c.master.WsPort, c.client.Token)), 0666)
assert.NoError(t, err)

Expand Down Expand Up @@ -273,11 +273,14 @@ spec:
time.Sleep(2 * time.Second)

err = os.WriteFile("./adminConfig", []byte(fmt.Sprintf(`
{"masters":[{"name":"http://localhost:%s","zone":"zone1"}],
{"masters":[{"name":"http://127.0.0.1:%s","zone":"zone1"}],
"token":"%s"}`, c.master.WsPort, "blaha")), 0666)
assert.NoError(t, err)

buf := &bytes.Buffer{}
logrus.SetFormatter(&logrus.TextFormatter{
DisableColors: true,
})
logrus.SetOutput(buf)
a := admin.NewAdmin("./adminConfig", "", "")
err = a.Exec(context.TODO(), "uptime")
Expand Down Expand Up @@ -362,7 +365,7 @@ spec:
time.Sleep(1 * time.Second)

err = os.WriteFile("./adminConfig", []byte(fmt.Sprintf(`
{"masters":[{"name":"http://localhost:%s","zone":"zone1"}],
{"masters":[{"name":"http://127.0.0.1:%s","zone":"zone1"}],
"token":"%s"}`, c.master.WsPort, c.client.Token)), 0666)
assert.NoError(t, err)

Expand Down
Empty file added e2e/gitrepo/.gitignore
View file
Open in desktop
Empty file.
9 changes: 4 additions & 5 deletions e2e/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ type testWrapper struct {
}

func initMasterAgent(t *testing.T, ctx context.Context) testWrapper {

logrus.SetLevel(logrus.DebugLevel)
port, err := freePort()
assert.NoError(t, err)
Expand All @@ -45,14 +44,14 @@ func initMasterAgent(t *testing.T, ctx context.Context) testWrapper {
RedisClient: redisMock,
Masters: config.Masters{
{
URL: "http://localhost:" + portStr,
URL: "http://127.0.0.1:" + portStr,
Zone: "zone1",
},
},
}
mockedCommander := mocks.NewMockCommander(t)
agent := agent.NewAgent("./agentConfig", mockedCommander)
agent.Master = "http://localhost:" + portStr
agent.Master = "http://127.0.0.1:" + portStr
agent.Hostname = "mycooltestagent"

wg := &sync.WaitGroup{}
Expand All @@ -72,7 +71,7 @@ func initMasterAgent(t *testing.T, ctx context.Context) testWrapper {
}()

time.Sleep(400 * time.Millisecond)
client := authedhttpclient.New(t, "http://localhost:"+portStr)
client := authedhttpclient.New(t, "http://127.0.0.1:"+portStr)
err = client.AuthAsAdmin()
assert.NoError(t, err)

Expand All @@ -90,7 +89,7 @@ func initMasterAgent(t *testing.T, ctx context.Context) testWrapper {
}
func freePort() (port int, err error) {
var a *net.TCPAddr
if a, err = net.ResolveTCPAddr("tcp", "localhost:0"); err == nil {
if a, err = net.ResolveTCPAddr("tcp", "127.0.0.1:0"); err == nil {
var l *net.TCPListener
if l, err = net.ListenTCP("tcp", a); err == nil {
port := l.Addr().(*net.TCPAddr).Port
Expand Down
4 changes: 4 additions & 0 deletions pkg/master/master.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,10 @@ func (m *Master) clone(ctx context.Context, authOpts *git.AuthOptions, cloneOpts
continue
}

if len(b) == 0 {
continue // skip empty files
}

err = yaml.Unmarshal(b, machine)
if err != nil {
logrus.Errorf("error yaml parse: %s err: %s", path, err)
Expand Down