Skip to content

Commit 48d1dbe

Browse files
committed
fixed tests data structure
1 parent 65af5fa commit 48d1dbe

File tree

9 files changed

+4
-47
lines changed

9 files changed

+4
-47
lines changed

packagehandlers/conanpackagehandler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func (conan *ConanPackageHandler) UpdateDependency(vulnDetails *utils.Vulnerabil
3333
func (conan *ConanPackageHandler) updateDirectDependency(vulnDetails *utils.VulnerabilityDetails) (err error) {
3434
conanDescriptors, err := conan.CommonPackageHandler.GetAllDescriptorFilesFullPaths([]string{conanFileTxt, conanFilePy})
3535
if err != nil {
36-
err = fmt.Errorf("failed while serching for conanfile in project: %s", err.Error())
36+
err = fmt.Errorf("failed while searching for Conan descriptor files in project: %s", err.Error())
3737
return
3838
}
3939
isAnyDescriptorFileChanged := false

packagehandlers/packagehandlers_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ func TestUpdateDependency(t *testing.T) {
355355
},
356356
scanDetails: scanDetails,
357357
fixSupported: true,
358-
testDirName: filepath.Join("conan", "conan_txt"),
358+
testDirName: filepath.Join("conan"),
359359
descriptorsToCheck: []string{"conanfile.txt"},
360360
},
361361
{
@@ -366,7 +366,7 @@ func TestUpdateDependency(t *testing.T) {
366366
},
367367
scanDetails: scanDetails,
368368
fixSupported: true,
369-
testDirName: filepath.Join("conan", "conan_py"),
369+
testDirName: filepath.Join("conan"),
370370
descriptorsToCheck: []string{"conanfile.py"},
371371
},
372372
{
@@ -377,7 +377,7 @@ func TestUpdateDependency(t *testing.T) {
377377
},
378378
scanDetails: scanDetails,
379379
fixSupported: true,
380-
testDirName: filepath.Join("conan", "conan_py_txt"),
380+
testDirName: filepath.Join("conan"),
381381
descriptorsToCheck: []string{"conanfile.py", "conanfile.txt"},
382382
},
383383
},

testdata/projects/conan/conan_py_txt/conanfile.py

Lines changed: 0 additions & 23 deletions
This file was deleted.

testdata/projects/conan/conan_py_txt/profile

Lines changed: 0 additions & 8 deletions
This file was deleted.

testdata/projects/conan/conan_txt/conanfile.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

testdata/projects/conan/conan_txt/profile

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)