7
7
from pythonforandroid .bootstrap import (
8
8
_cmp_bootstraps_by_priority , Bootstrap , expand_dependencies ,
9
9
)
10
- from pythonforandroid .distribution import Distribution
10
+ from pythonforandroid .distribution import Distribution , generate_dist_folder_name
11
11
from pythonforandroid .recipe import Recipe
12
12
from pythonforandroid .archs import ArchARMv7_a
13
13
from pythonforandroid .build import Context
@@ -22,6 +22,8 @@ class BaseClassSetupBootstrap(object):
22
22
`setUp` and `tearDown` methods.
23
23
"""
24
24
25
+ TEST_ARCH = 'armeabi-v7a'
26
+
25
27
def setUp (self ):
26
28
self .ctx = Context ()
27
29
self .ctx .ndk_api = 21
@@ -43,7 +45,9 @@ def setUp_distribution_with_bootstrap(self, bs):
43
45
"""
44
46
self .ctx .bootstrap = bs
45
47
self .ctx .bootstrap .distribution = Distribution .get_distribution (
46
- self .ctx , name = "test_prj" , recipes = ["python3" , "kivy" ]
48
+ self .ctx , name = "test_prj" ,
49
+ recipes = ["python3" , "kivy" ],
50
+ arch_name = self .TEST_ARCH ,
47
51
)
48
52
49
53
def tearDown (self ):
@@ -79,7 +83,9 @@ def test_attributes(self):
79
83
80
84
# test dist_dir success
81
85
self .setUp_distribution_with_bootstrap (bs )
82
- self .assertTrue (bs .dist_dir .endswith ("dists/test_prj" ))
86
+ expected_folder_name = generate_dist_folder_name ('test_prj' , [self .TEST_ARCH ])
87
+ self .assertTrue (
88
+ bs .dist_dir .endswith (f"dists/{ expected_folder_name } " ))
83
89
84
90
def test_build_dist_dirs (self ):
85
91
"""A test which will initialize a bootstrap and will check if the
0 commit comments