ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2024-11-10 08:57:25 +01:00
Code Issues Packages Releases Activity

Fix more merge bugs

Browse Source
This commit is contained in:
Jan Eitzinger 2023-04-12 07:30:41 +02:00
parent 33ed07a35a
commit ecd0709851
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/archive/fsBackend.go
View File

@ -341,8 +341,6 @@ func (fsa *FsArchive) ImportJob(
} }
if err := f.Close(); err != nil { if err := f.Close(); err != nil {
log.Warn("Error while closing data.json file") log.Warn("Error while closing data.json file")
return err
} }
return f.Close() return err
} }

1
test/integration_test.go
View File

@ -494,7 +494,6 @@ func TestRestApi(t *testing.T) {
} }
const stopJobBody string = `{ const stopJobBody string = `{
"jobId": 123,
"jobId": 123, "jobId": 123,
"startTime": 123456789, "startTime": 123456789,
"cluster": "testcluster", "cluster": "testcluster",