Skip to content

Commit 752deb8

Browse files
committed
python3Packages.craft-application: disable x86_64 specific tests on aarch64
1 parent fa88a05 commit 752deb8

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed

pkgs/by-name/ch/charmcraft/package.nix

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
cacert,
88
versionCheckHook,
99
writableTmpDirAsHomeHook,
10+
stdenv,
1011
}:
1112
let
1213
version = "4.10.0";
@@ -26,6 +27,17 @@ let
2627
substituteInPlace pyproject.toml --replace-fail "setuptools==75.8.0" "setuptools"
2728
substituteInPlace craft_application/git/_git_repo.py --replace-fail "/snap/core22/current/etc/ssl/certs" "${cacert}/etc/ssl/certs"
2829
'';
30+
31+
disabledTestPaths = [
32+
# These tests assert outputs of commands that assume Ubuntu-related output.
33+
"tests/unit/services/test_lifecycle.py"
34+
];
35+
36+
disabledTests =
37+
old.disabledTests
38+
++ lib.optionals stdenv.hostPlatform.isAarch64 [
39+
"test_process_grammar_full"
40+
];
2941
});
3042
};
3143
};

pkgs/development/python-modules/craft-application/default.nix

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,21 @@ buildPythonPackage rec {
127127
"test_process_grammar_build_for"
128128
"test_process_grammar_platform"
129129
"test_process_grammar_default"
130+
"test_create_craft_manifest"
131+
"test_create_project_manifest"
132+
"test_from_packed_artifact"
133+
"test_teardown_session_create_manifest"
130134
];
131135

132-
disabledTestPaths = [
133-
# These tests assert outputs of commands that assume Ubuntu-related output.
134-
"tests/unit/services/test_lifecycle.py"
135-
];
136+
disabledTestPaths =
137+
[
138+
# These tests assert outputs of commands that assume Ubuntu-related output.
139+
"tests/unit/services/test_lifecycle.py"
140+
]
141+
++ lib.optionals stdenv.hostPlatform.isAarch64 [
142+
# Hard-coded assumptions around use of "amd64" arch strings.
143+
"tests/unit/services/test_project.py"
144+
];
136145

137146
passthru.updateScript = nix-update-script { };
138147

0 commit comments

Comments
 (0)