Skip to content

Commit 871cdfc

Browse files
committed
removed fixed tests
1 parent d12b06d commit 871cdfc

2 files changed

Lines changed: 5 additions & 20 deletions

File tree

src/service/docker/docker_service_test.go

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"github.com/docker/docker/api/types/container"
66
"github.com/google/uuid"
77
"github.com/makeopensource/leviathan/common"
8-
v1 "github.com/makeopensource/leviathan/generated/types/v1"
98
"sync"
109
"testing"
1110
)
@@ -49,21 +48,6 @@ func TestCopyToContainer(t *testing.T) {
4948
t.Fatalf("%v", err)
5049
}
5150

52-
dir, err := common.CreateTmpJobDir(ifg.String(), "", &v1.FileUpload{
53-
Filename: "test.txt",
54-
Content: []byte("tests test"),
55-
})
56-
if err != nil {
57-
t.Fatalf("%v", err)
58-
return
59-
}
60-
61-
// just copy and check if it succeeds
62-
err = machine.CopyToContainer(contId, dir)
63-
if err != nil {
64-
t.Fatalf("%v", err)
65-
}
66-
6751
err = machine.RemoveContainer(contId, true, true)
6852
if err != nil {
6953
t.Fatalf("%v", err)

src/service/jobs/job_service_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"github.com/rs/zerolog"
1010
"github.com/rs/zerolog/log"
1111
"github.com/stretchr/testify/assert"
12+
"os"
1213
"path/filepath"
1314
"strings"
1415
"sync"
@@ -161,22 +162,22 @@ func testJobProcessor(t *testing.T, studentCodePath string, correctOutput string
161162
}
162163

163164
func setupJobProcess(studentCodePath string, timeout time.Duration) string {
164-
graderBytes, err := common.ReadFileBytes(graderFilePath)
165+
graderBytes, err := os.ReadFile(graderFilePath)
165166
if err != nil {
166167
log.Fatal().Err(err).Msg("Error reading grader.py")
167168
}
168169

169-
makefileBytes, err := common.ReadFileBytes(makeFilePath)
170+
makefileBytes, err := os.ReadFile(makeFilePath)
170171
if err != nil {
171172
log.Fatal().Err(err).Msg("Error reading grader.py")
172173
}
173174

174-
studentBytes, err := common.ReadFileBytes(studentCodePath)
175+
studentBytes, err := os.ReadFile(studentCodePath)
175176
if err != nil {
176177
log.Fatal().Err(err).Msg("Error reading student")
177178
}
178179

179-
dockerBytes, err := common.ReadFileBytes(dockerFilePath)
180+
dockerBytes, err := os.ReadFile(dockerFilePath)
180181
if err != nil {
181182
log.Fatal().Err(err).Msg("Error reading docker file")
182183
}

0 commit comments

Comments
 (0)