Fixed test_distribution.py

Author: inclement

tests/test_distribution.py

@@ -10,7 +10,7 @@
 from pythonforandroid.build import Context
 
 dist_info_data = {
-    "dist_name": None,
+    "dist_name": "sdl2_dist",
     "bootstrap": "sdl2",
     "archs": ["armeabi", "armeabi-v7a", "x86", "x86_64", "arm64-v8a"],
     "ndk_api": 21,
@@ -27,6 +27,8 @@ class TestDistribution(unittest.TestCase):
     :mod:`~pythonforandroid.distribution`.
     """
 
+    TEST_ARCH = 'armeabi-v7a'
+
     def setUp(self):
         """Configure a :class:`~pythonforandroid.build.Context` so we can
         perform our unittests"""
@@ -51,8 +53,10 @@ def setUp_distribution_with_bootstrap(self, bs, **kwargs):
             self.ctx,
             name=kwargs.pop("name", "test_prj"),
             recipes=kwargs.pop("recipes", ["python3", "kivy"]),
+            arch_name=self.TEST_ARCH,
             **kwargs
         )
+        print('distribution when made is', self.ctx.bootstrap.distribution)
 
     def tearDown(self):
         """Here we make sure that we reset a possible bootstrap created in
@@ -108,7 +112,7 @@ def test_get_distribution_no_name(self, mock_exists):
         returns the proper result which should `unnamed_dist_1`."""
         mock_exists.return_value = False
         self.ctx.bootstrap = Bootstrap().get_bootstrap("sdl2", self.ctx)
-        dist = Distribution.get_distribution(self.ctx)
+        dist = Distribution.get_distribution(self.ctx, arch_name=self.TEST_ARCH)
         self.assertEqual(dist.name, "unnamed_dist_1")
 
     @mock.patch("pythonforandroid.util.chdir")
@@ -154,10 +158,12 @@ def test_get_distributions(
         ]
 
         dists = self.ctx.bootstrap.distribution.get_distributions(self.ctx)
+        print('dists are', dists)
         self.assertIsInstance(dists, list)
         self.assertEqual(len(dists), 1)
         self.assertIsInstance(dists[0], Distribution)
-        self.assertEqual(dists[0].name, "sdl2-python3")
+        self.assertEqual(dists[0].name, "sdl2_dist")
+        self.assertEqual(dists[0].dist_dir, "sdl2-python3")
         self.assertEqual(dists[0].ndk_api, 21)
         self.assertEqual(
             dists[0].recipes,
@@ -206,7 +212,10 @@ def test_get_distributions_error_ndk_api_mismatch(
         distribution with the same `name` but different `ndk_api`.
         """
         expected_dist = Distribution.get_distribution(
-            self.ctx, name="test_prj", recipes=["python3", "kivy"]
+            self.ctx,
+            name="test_prj",
+            recipes=["python3", "kivy"],
+            arch_name=self.TEST_ARCH,
         )
         mock_get_dists.return_value = [expected_dist]
         mock_glob.return_value = ["sdl2-python3"]
@@ -254,7 +263,10 @@ def test_get_distributions_possible_dists(self, mock_get_dists):
         `:class:`~pythonforandroid.distribution.Distribution`.
         """
         expected_dist = Distribution.get_distribution(
-            self.ctx, name="test_prj", recipes=["python3", "kivy"]
+            self.ctx,
+            name="test_prj",
+            recipes=["python3", "kivy"],
+            arch_name=self.TEST_ARCH,
         )
         mock_get_dists.return_value = [expected_dist]
         self.setUp_distribution_with_bootstrap(