Skip to content

Commit 5af0369

Browse files
committed
Remove no timeout flag
1 parent 2c033fe commit 5af0369

File tree

3 files changed

+11
-23
lines changed

3 files changed

+11
-23
lines changed

commands/case.go

+6-15
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,14 @@ func writeLinesToFile(filename string, lines []string) error {
4747
// Create and save user specified custom case input, and update the given egor meta data
4848
func AddNewCaseInput(inputLines []string,
4949
caseName string,
50-
metaData config.EgorMeta,
51-
noTimeOut bool) (config.EgorMeta, error) {
50+
metaData config.EgorMeta) (config.EgorMeta, error) {
5251

5352
inputFileName := caseName + ".in"
5453
err := writeLinesToFile(path.Join("inputs", inputFileName), inputLines)
5554
if err != nil {
5655
return metaData, err
5756
}
58-
inputFile := config.NewIoFile(inputFileName, path.Join("inputs", inputFileName), true, noTimeOut)
57+
inputFile := config.NewIoFile(inputFileName, path.Join("inputs", inputFileName), true)
5958
metaData.Inputs = append(metaData.Inputs, inputFile)
6059

6160
return metaData, nil
@@ -64,15 +63,14 @@ func AddNewCaseInput(inputLines []string,
6463
// Create and save user specified custom csae output, and update the given egor meta data
6564
func AddNewCaseOutput(outputLines []string,
6665
caseName string,
67-
metaData config.EgorMeta,
68-
noTimeOut bool) (config.EgorMeta, error) {
66+
metaData config.EgorMeta) (config.EgorMeta, error) {
6967

7068
outputFileName := caseName + ".ans"
7169
err := writeLinesToFile(path.Join("outputs", outputFileName), outputLines)
7270
if err != nil {
7371
return metaData, err
7472
}
75-
outputFile := config.NewIoFile(outputFileName, path.Join("outputs", outputFileName), true, noTimeOut)
73+
outputFile := config.NewIoFile(outputFileName, path.Join("outputs", outputFileName), true)
7674
metaData.Outputs = append(metaData.Outputs, outputFile)
7775

7876
return metaData, nil
@@ -102,12 +100,10 @@ func CustomCaseAction(context *cli.Context) error {
102100
return err
103101
}
104102

105-
noTimeOut := context.Bool("no-timeout")
106-
107103
caseName := "test-" + strconv.Itoa(len(metaData.Inputs))
108104
color.Green("Provide your input:")
109105
inputLines := readFromStdin()
110-
metaData, err = AddNewCaseInput(inputLines, caseName, metaData, noTimeOut)
106+
metaData, err = AddNewCaseInput(inputLines, caseName, metaData)
111107

112108
if err != nil {
113109
color.Red("Failed to add new case input")
@@ -117,7 +113,7 @@ func CustomCaseAction(context *cli.Context) error {
117113
if !context.Bool("no-output") {
118114
color.Green("Provide your output:")
119115
outputLines := readFromStdin()
120-
metaData, err = AddNewCaseOutput(outputLines, caseName, metaData, noTimeOut)
116+
metaData, err = AddNewCaseOutput(outputLines, caseName, metaData)
121117

122118
if err != nil {
123119
color.Red("Failed to add new case output")
@@ -148,10 +144,5 @@ var CaseCommand = cli.Command{
148144
Usage: "This test case doesnt have output",
149145
Value: false,
150146
},
151-
&cli.BoolFlag{
152-
Name: "no-timeout",
153-
Usage: "This test case should not timeout when passed time limit",
154-
Value: false,
155-
},
156147
},
157148
}

commands/case_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,12 @@ func TestAddNewCaseInput(t *testing.T) {
4646

4747
inputLines := []string{"Hello", "World"}
4848
caseName := "test-2"
49-
meteData, err := AddNewCaseInput(inputLines, caseName, meteData, true)
49+
meteData, err := AddNewCaseInput(inputLines, caseName, meteData)
5050

5151
assert.Equal(t, err, nil)
5252
assert.Equal(t, len(meteData.Inputs), 3)
5353
assert.Equal(t, meteData.Inputs[2].Name, caseName + ".in")
5454
assert.Equal(t, meteData.Inputs[2].Custom, true)
55-
assert.Equal(t, meteData.Inputs[2].NoTimeOut, true)
5655

5756
}
5857

@@ -66,7 +65,7 @@ func TestAddNewCaseOutput(t *testing.T) {
6665

6766
outputLines := []string{"Hello", "World"}
6867
caseName := "test-2"
69-
meteData, err := AddNewCaseOutput(outputLines, caseName, meteData, true)
68+
meteData, err := AddNewCaseOutput(outputLines, caseName, meteData)
7069

7170
assert.Equal(t, err, nil)
7271
assert.Equal(t, len(meteData.Outputs), 2)

config/meta.go

+3-5
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,13 @@ type IoFile struct {
1414
Name string
1515
Path string
1616
Custom bool
17-
NoTimeOut bool
1817
}
1918

20-
func NewIoFile(fileName, filePath string, customCase, noTimeOut bool) IoFile {
19+
func NewIoFile(fileName, filePath string, customCase bool) IoFile {
2120
return IoFile{
2221
Name: fileName,
2322
Path: filePath,
2423
Custom: customCase,
25-
NoTimeOut: noTimeOut,
2624
}
2725
}
2826

@@ -58,8 +56,8 @@ func NewEgorMeta(task Task, config Config) EgorMeta {
5856
outputs := make([]IoFile, testCount)
5957
for i := 0; i < testCount; i++ {
6058
fileName := fmt.Sprintf("test-%d", i)
61-
inputs[i] = NewIoFile(fileName, path.Join("inputs", fileName+".in"), false, false)
62-
outputs[i] = NewIoFile(fileName, path.Join("outputs", fileName+".ans"), false, false)
59+
inputs[i] = NewIoFile(fileName, path.Join("inputs", fileName+".in"), false)
60+
outputs[i] = NewIoFile(fileName, path.Join("outputs", fileName+".ans"), false)
6361
}
6462
taskFile, err := GetTaskName(config)
6563
if err != nil {

0 commit comments

Comments
 (0)