Skip to content
This repository was archived by the owner on Mar 27, 2025. It is now read-only.

Commit 1d0f472

Browse files
author
Federico Guerinoni
committed
Clean config folder at end of test
Signed-off-by: Federico Guerinoni <guerra@develer.com>
1 parent 1176156 commit 1d0f472

File tree

3 files changed

+32
-11
lines changed

3 files changed

+32
-11
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
- name: check out code
1212
uses: actions/checkout@v2
1313

14-
- name: run mqtt tests
14+
- name: run functional test
1515
run: ./scripts/functional-tests.sh
1616

1717
- name: run install tests
18-
run: ./scripts/install-tests.sh
18+
run: ./scripts/install-tests.sh

install.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,7 @@ func install(s service.Service) error {
6969

7070
// createConfig creates yml file where will be stored what arduino-connector install
7171
func createConfig() error {
72-
if _, err := os.Stat(configDirectory); err != nil {
73-
err = os.Mkdir(configDirectory, 0755)
74-
if err != nil {
75-
return err
76-
}
77-
}
72+
createConfigFolder()
7873

7974
value, err := isDockerInstalled()
8075
if err != nil {
@@ -98,6 +93,7 @@ func createConfig() error {
9893
func createConfigFolder() error {
9994
err := os.Mkdir(configDirectory, 0755)
10095
if err != nil {
96+
fmt.Println(err)
10197
return err
10298
}
10399

uninstall_test.go

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestUninstallSketches(t *testing.T) {
3535
t.Error(err)
3636
}
3737

38-
file, errFile := os.Create(folder + "/fakeSketch")
38+
file, errFile := os.Create(folder + "/sketches")
3939
if errFile != nil {
4040
t.Error(errFile)
4141
}
@@ -44,12 +44,12 @@ func TestUninstallSketches(t *testing.T) {
4444
assert.True(t, err == nil)
4545
file.Close()
4646

47-
_, err = os.Stat(folder + "/fakeSketch")
47+
_, err = os.Stat(folder + "/sketches")
4848
assert.True(t, err == nil)
4949

5050
resp := dashboard.MqttSendAndReceiveTimeout(t, "/status/uninstall", "{}", 50*time.Millisecond)
5151

52-
_, err = os.Stat(folder + "/fakeSketch")
52+
_, err = os.Stat(folder + "/sketches")
5353

5454
assert.True(t, resp == "INFO: OK\n")
5555
assert.True(t, err != nil)
@@ -158,6 +158,11 @@ func TestUninstallDockerAllContainer(t *testing.T) {
158158
err = createConfig()
159159
assert.True(t, err == nil)
160160

161+
defer func() {
162+
err = os.RemoveAll(configDirectory)
163+
assert.True(t, err == nil)
164+
}()
165+
161166
c, errCreate := cli.ContainerCreate(ctx, &container.Config{
162167
Image: "alpine",
163168
Cmd: []string{"echo", "hello world"},
@@ -200,6 +205,11 @@ func TestUninstallNotAllDockerContainer(t *testing.T) {
200205
err = createConfig()
201206
assert.True(t, err == nil)
202207

208+
defer func() {
209+
err = os.RemoveAll(configDirectory)
210+
assert.True(t, err == nil)
211+
}()
212+
203213
ctx := context.Background()
204214
reader, err := cli.ImagePull(ctx, "alpine", types.ImagePullOptions{})
205215
assert.True(t, err == nil)
@@ -265,6 +275,11 @@ func TestUninstallAllImages(t *testing.T) {
265275
err = createConfig()
266276
assert.True(t, err == nil)
267277

278+
defer func() {
279+
err = os.RemoveAll(configDirectory)
280+
assert.True(t, err == nil)
281+
}()
282+
268283
ctx := context.Background()
269284
reader, err := cli.ImagePull(ctx, "docker.io/library/alpine", types.ImagePullOptions{})
270285
assert.True(t, err == nil)
@@ -313,6 +328,11 @@ func TestUninstallNetworkManagerNotRemove(t *testing.T) {
313328
errConfig := createConfig()
314329
assert.True(t, errConfig == nil)
315330

331+
defer func() {
332+
err := os.RemoveAll(configDirectory)
333+
assert.True(t, err == nil)
334+
}()
335+
316336
assert.True(t, isNetManagerInstalled())
317337

318338
resp := dashboard.MqttSendAndReceiveTimeout(t, "/status/uninstall", "{}", 5*time.Minute)
@@ -336,6 +356,11 @@ func TestUninstallNetworkManager(t *testing.T) {
336356
err := createConfig()
337357
assert.True(t, err == nil)
338358

359+
defer func() {
360+
err = os.RemoveAll(configDirectory)
361+
assert.True(t, err == nil)
362+
}()
363+
339364
assert.False(t, isNetManagerInstalled())
340365

341366
c := exec.Command("bash", "-c", "apt-get install -y network-manager")

0 commit comments

Comments
 (0)