tests: fix fixture imports

This commit is contained in:
Willi Ballenthin
2023-07-06 19:04:53 +02:00
parent e675bef062
commit a43d2c115f
10 changed files with 34 additions and 12 deletions

8
.github/ruff.toml vendored
View File

@@ -49,5 +49,13 @@ exclude = [
# F401: `foo` imported but unused # F401: `foo` imported but unused
# F811 Redefinition of unused `foo` # F811 Redefinition of unused `foo`
"tests/test_main.py" = ["F401", "F811"] "tests/test_main.py" = ["F401", "F811"]
"tests/test_proto.py" = ["F401", "F811"]
"tests/test_freeze.py" = ["F401", "F811"] "tests/test_freeze.py" = ["F401", "F811"]
"tests/test_function_id.py" = ["F401", "F811"] "tests/test_function_id.py" = ["F401", "F811"]
"tests/test_viv_features.py" = ["F401", "F811"]
"tests/test_binja_features.py" = ["F401", "F811"]
"tests/test_pefile_features.py" = ["F401", "F811"]
"tests/test_dnfile_features.py" = ["F401", "F811"]
"tests/test_dotnet_features.py" = ["F401", "F811"]
"tests/test_result_document.py" = ["F401", "F811"]
"tests/test_dotnetfile_features.py" = ["F401", "F811"]

View File

@@ -10,6 +10,7 @@ import logging
import pytest import pytest
import fixtures import fixtures
from fixtures import scope, sample
import capa.main import capa.main

View File

@@ -7,10 +7,10 @@
# See the License for the specific language governing permissions and limitations under the License. # See the License for the specific language governing permissions and limitations under the License.
import fixtures import fixtures
from fixtures import parametrize from fixtures import scope, sample
@parametrize( @fixtures.parametrize(
"sample,scope,feature,expected", "sample,scope,feature,expected",
fixtures.FEATURE_PRESENCE_TESTS_DOTNET, fixtures.FEATURE_PRESENCE_TESTS_DOTNET,
indirect=["sample", "scope"], indirect=["sample", "scope"],
@@ -19,7 +19,7 @@ def test_dnfile_features(sample, scope, feature, expected):
fixtures.do_test_feature_presence(fixtures.get_dnfile_extractor, sample, scope, feature, expected) fixtures.do_test_feature_presence(fixtures.get_dnfile_extractor, sample, scope, feature, expected)
@parametrize( @fixtures.parametrize(
"sample,scope,feature,expected", "sample,scope,feature,expected",
fixtures.FEATURE_COUNT_TESTS_DOTNET, fixtures.FEATURE_COUNT_TESTS_DOTNET,
indirect=["sample", "scope"], indirect=["sample", "scope"],

View File

@@ -7,10 +7,10 @@
# See the License for the specific language governing permissions and limitations under the License. # See the License for the specific language governing permissions and limitations under the License.
import fixtures import fixtures
from fixtures import parametrize from fixtures import scope, sample, b9f5b_dotnetfile_extractor, mixed_mode_64_dotnetfile_extractor
@parametrize( @fixtures.parametrize(
"sample,scope,feature,expected", "sample,scope,feature,expected",
fixtures.FEATURE_PRESENCE_TESTS_DOTNET, fixtures.FEATURE_PRESENCE_TESTS_DOTNET,
indirect=["sample", "scope"], indirect=["sample", "scope"],
@@ -19,7 +19,7 @@ def test_dnfile_features(sample, scope, feature, expected):
fixtures.do_test_feature_presence(fixtures.get_dnfile_extractor, sample, scope, feature, expected) fixtures.do_test_feature_presence(fixtures.get_dnfile_extractor, sample, scope, feature, expected)
@parametrize( @fixtures.parametrize(
"extractor,function,expected", "extractor,function,expected",
[ [
("b9f5b_dotnetfile_extractor", "is_dotnet_file", True), ("b9f5b_dotnetfile_extractor", "is_dotnet_file", True),

View File

@@ -8,14 +8,20 @@
import pytest import pytest
import fixtures import fixtures
from fixtures import parametrize from fixtures import (
FEATURE_PRESENCE_TESTS_DOTNET,
scope,
sample,
b9f5b_dotnetfile_extractor,
mixed_mode_64_dotnetfile_extractor,
)
import capa.features.file import capa.features.file
@parametrize( @fixtures.parametrize(
"sample,scope,feature,expected", "sample,scope,feature,expected",
fixtures.FEATURE_PRESENCE_TESTS_DOTNET, FEATURE_PRESENCE_TESTS_DOTNET,
indirect=["sample", "scope"], indirect=["sample", "scope"],
) )
def test_dotnetfile_features(sample, scope, feature, expected): def test_dotnetfile_features(sample, scope, feature, expected):
@@ -28,7 +34,7 @@ def test_dotnetfile_features(sample, scope, feature, expected):
fixtures.do_test_feature_presence(fixtures.get_dotnetfile_extractor, sample, scope, feature, expected) fixtures.do_test_feature_presence(fixtures.get_dotnetfile_extractor, sample, scope, feature, expected)
@parametrize( @fixtures.parametrize(
"extractor,function,expected", "extractor,function,expected",
[ [
("b9f5b_dotnetfile_extractor", "is_dotnet_file", True), ("b9f5b_dotnetfile_extractor", "is_dotnet_file", True),

View File

@@ -11,6 +11,10 @@ import textwrap
import fixtures import fixtures
from fixtures import ( from fixtures import (
z499c2_extractor,
z9324d_extractor,
pma16_01_extractor,
pingtaest_extractor,
_692f_dotnetfile_extractor, _692f_dotnetfile_extractor,
_1c444_dotnetfile_extractor, _1c444_dotnetfile_extractor,
_039a6_dotnetfile_extractor, _039a6_dotnetfile_extractor,

View File

@@ -7,12 +7,12 @@
# See the License for the specific language governing permissions and limitations under the License. # See the License for the specific language governing permissions and limitations under the License.
import pytest import pytest
import fixtures import fixtures
from fixtures import parametrize from fixtures import scope, sample
import capa.features.file import capa.features.file
@parametrize( @fixtures.parametrize(
"sample,scope,feature,expected", "sample,scope,feature,expected",
fixtures.FEATURE_PRESENCE_TESTS, fixtures.FEATURE_PRESENCE_TESTS,
indirect=["sample", "scope"], indirect=["sample", "scope"],

View File

@@ -9,6 +9,7 @@ import copy
from typing import Any from typing import Any
import pytest import pytest
from fixtures import a3f3bbc_rd, a076114_rd, pma0101_rd, al_khaserx64_rd, al_khaserx86_rd, dotnet_1c444e_rd
import capa.rules import capa.rules
import capa.render import capa.render

View File

@@ -9,6 +9,7 @@ import copy
import pytest import pytest
import fixtures import fixtures
from fixtures import a3f3bbc_rd, a076114_rd, pma0101_rd, al_khaserx64_rd, al_khaserx86_rd, dotnet_1c444e_rd
import capa import capa
import capa.engine as ceng import capa.engine as ceng

View File

@@ -6,6 +6,7 @@
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and limitations under the License. # See the License for the specific language governing permissions and limitations under the License.
import fixtures import fixtures
from fixtures import scope, sample
@fixtures.parametrize( @fixtures.parametrize(