✅ Update tests to work without python2

Author: opacam

tests/test_bootstrap.py

@@ -76,7 +76,7 @@ def test_attributes(self):
         bs = Bootstrap().get_bootstrap("sdl2", self.ctx)
         self.assertEqual(bs.name, "sdl2")
         self.assertEqual(bs.jni_dir, "sdl2/jni")
-        self.assertEqual(bs.get_build_dir_name(), "sdl2-python3")
+        self.assertEqual(bs.get_build_dir_name(), "sdl2")
 
         # bs.dist_dir should raise an error if there is no distribution to query
         bs.distribution = None
@@ -100,7 +100,7 @@ def test_build_dist_dirs(self):
         bs = Bootstrap.get_bootstrap("sdl2", self.ctx)
 
         self.assertTrue(
-            bs.get_build_dir().endswith("build/bootstrap_builds/sdl2-python3")
+            bs.get_build_dir().endswith("build/bootstrap_builds/sdl2")
         )
         self.assertTrue(bs.get_dist_dir("test_prj").endswith("dists/test_prj"))
         self.assertTrue(
@@ -181,8 +181,8 @@ def test_expand_dependencies_with_pure_python_package(self):
         expanded_result = expand_dependencies(
             ["python3", "kivy", "peewee"], self.ctx
         )
-        # we expect to have two results (one for python2 and one for python3)
-        self.assertEqual(len(expanded_result), 2)
+        # we expect to one results for python3
+        self.assertEqual(len(expanded_result), 1)
         self.assertIsInstance(expanded_result, list)
         for i in expanded_result:
             self.assertIsInstance(i, list)
@@ -244,11 +244,6 @@ def _add_sdl2_conflicting_recipe(name, ctx):
         )
         self.assertEqual(bs.name, "service_only")
 
-        # Test wrong recipes
-        wrong_recipes = {"python2", "python3", "pyjnius"}
-        bs = Bootstrap.get_bootstrap_from_recipes(wrong_recipes, self.ctx)
-        self.assertIsNone(bs)
-
     @mock.patch("pythonforandroid.bootstrap.ensure_dir")
     def test_prepare_dist_dir(self, mock_ensure_dir):
         """A test which will initialize a bootstrap and will check if the

tests/test_graph.py

@@ -13,7 +13,7 @@
 
 ctx = Context()
 
-name_sets = [['python2'],
+name_sets = [['python3'],
              ['kivy']]
 bootstraps = [None,
               Bootstrap.get_bootstrap('sdl2', ctx)]
@@ -26,7 +26,7 @@
     ]
 )
 invalid_combinations = [
-    [['python2', 'python3'], None],
+    [['pil', 'pillow'], None],
     [['pysdl2', 'genericndkbuild'], None],
 ]
 invalid_combinations_simple = list(invalid_combinations)
@@ -211,7 +211,7 @@ def test_multichoice_obvious_conflict_checker(monkeypatch):
 def test_bootstrap_dependency_addition():
     build_order, python_modules, bs = get_recipe_order_and_bootstrap(
         ctx, ['kivy'], None)
-    assert (('hostpython2' in build_order) or ('hostpython3' in build_order))
+    assert ('hostpython3' in build_order)
 
 
 def test_graph_deplist_transformation():
@@ -227,8 +227,8 @@ def test_graph_deplist_transformation():
 
 def test_bootstrap_dependency_addition2():
     build_order, python_modules, bs = get_recipe_order_and_bootstrap(
-        ctx, ['kivy', 'python2'], None)
-    assert 'hostpython2' in build_order
+        ctx, ['kivy', 'python3'], None)
+    assert 'hostpython3' in build_order
 
 
 if __name__ == "__main__":