Skip to content

Commit 236373a

Browse files
committed
Fix resolve pipe tests and executable_binaries logic
1 parent 955ac6c commit 236373a

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

scanpipe/models.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2497,7 +2497,10 @@ def macho_binaries(self):
24972497
)
24982498

24992499
def executable_binaries(self):
2500-
return self.union(self.win_exes(), self.macho_binaries(), self.elfs())
2500+
return self.win_exes().order_by().union(
2501+
self.macho_binaries().order_by(),
2502+
self.elfs().order_by()
2503+
)
25012504

25022505
def with_has_children(self):
25032506
"""

scanpipe/tests/pipes/test_resolve.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def test_scanpipe_pipes_resolve_resolve_pypi_packages(self, mock_resolve):
133133

134134
mock_resolve.return_value = mock.Mock(packages=inspector_output["packages"])
135135

136-
packages = resolve.resolve_pypi_packages("")
136+
packages = resolve.resolve_pypi_packages("requirements.txt")
137137
self.assertEqual(2, len(packages))
138138
package_data = packages[0]
139139
self.assertEqual("pip", package_data["name"])

0 commit comments

Comments
 (0)