more tests for python home config in test_standalone

Author: tomasstupka

graalpython/com.oracle.graal.python.test/src/tests/standalone/check_home_pom.xml

@@ -73,14 +73,7 @@ SOFTWARE.
         <executions>
           <execution>
             <configuration>
-              <pythonHome>
-                <includes>
-                  <include>.*__init__\.py</include>
-                </includes>
-                <excludes>
-                  <exclude>.*html/__init__\.py</exclude>
-                </excludes>
-              </pythonHome>
+
             </configuration>
             <goals>
               <goal>process-graalpy-resources</goal>

graalpython/com.oracle.graal.python.test/src/tests/standalone/test_standalone.py

@@ -265,11 +265,7 @@ def test_gen_launcher_and_venv(self):
             util.check_ouput("termcolor", out, False)
 
             # remove ujson pkg from plugin config and check if unistalled
-            with open(os.path.join(target_dir, "pom.xml"), "r") as f:
-                contents = f.read()
-
-            with open(os.path.join(target_dir, "pom.xml"), "w") as f:
-                f.write(contents.replace("<package>ujson</package>", ""))
+            replace_in_file(os.path.join(target_dir, "pom.xml"), "<package>ujson</package>", "")
 
             cmd = mvnw_cmd + ["process-resources"]
             out, return_code = util.run_cmd(cmd, self.env, cwd=target_dir)
@@ -278,6 +274,11 @@ def test_gen_launcher_and_venv(self):
             util.check_ouput("Uninstalling ujson", out)
             util.check_ouput("termcolor", out, False)
 
+    def check_tagfile(self, target_dir, expected):
+        with open(os.path.join(target_dir, "target", "classes", VFS_PREFIX, "home", "tagfile")) as f:
+            lines = f.readlines()
+        assert lines == expected, "expected tagfile " + str(expected) + ", but got " + str(lines)
+
     @unittest.skipUnless(is_enabled, "ENABLE_STANDALONE_UNITTESTS is not true")
     def test_check_home(self):
          with tempfile.TemporaryDirectory() as tmpdir:
@@ -288,17 +289,85 @@ def test_check_home(self):
 
             mvnw_cmd = util.get_mvn_wrapper(target_dir, self.env)
 
-            cmd = mvnw_cmd + ["process-resources"]
-            out, return_code = util.run_cmd(cmd, self.env, cwd=target_dir)
+            # 1. process-resources with no pythonHome config
+            process_resources_cmd = mvnw_cmd + ["process-resources"]
+            out, return_code = util.run_cmd(process_resources_cmd, self.env, cwd=target_dir)
+            util.check_ouput("BUILD SUCCESS", out)
+            util.check_ouput("Copying std lib to ", out)
+
+            home_dir = os.path.join(target_dir, "target", "classes", VFS_PREFIX, "home")
+            assert os.path.exists(home_dir)
+            assert os.path.exists(os.path.join(home_dir, "lib-graalpython"))
+            assert os.path.isdir(os.path.join(home_dir, "lib-graalpython"))
+            assert os.path.exists(os.path.join(home_dir, "lib-python"))
+            assert os.path.isdir(os.path.join(home_dir, "lib-python"))
+            assert os.path.exists(os.path.join(home_dir, "tagfile"))
+            assert os.path.isfile(os.path.join(home_dir, "tagfile"))
+            self.check_tagfile(target_dir, [f'{self.graalvmVersion}\n', 'include:.*\n'])
+
+            # 2. process-resources with empty pythonHome includes and excludes
+            shutil.copyfile(pom_template, os.path.join(target_dir, "pom.xml"))
+            util.patch_pom_repositories(os.path.join(target_dir, "pom.xml"))
+            replace_in_file(os.path.join(target_dir, "pom.xml"), "</configuration>", "<pythonHome></pythonHome></configuration>")
+            out, return_code = util.run_cmd(process_resources_cmd, self.env, cwd=target_dir)
+            util.check_ouput("BUILD SUCCESS", out)
+            util.check_ouput("Copying std lib to ", out, False)
+            self.check_tagfile(target_dir, [f'{self.graalvmVersion}\n', 'include:.*\n'])
 
-            # check fileslist.txt
+            shutil.copyfile(pom_template, os.path.join(target_dir, "pom.xml"))
+            util.patch_pom_repositories(os.path.join(target_dir, "pom.xml"))
+            replace_in_file(os.path.join(target_dir, "pom.xml"), "</configuration>", "<pythonHome><includes></includes><excludes></excludes></pythonHome></configuration>")
+            out, return_code = util.run_cmd(process_resources_cmd, self.env, cwd=target_dir)
+            util.check_ouput("BUILD SUCCESS", out)
+            util.check_ouput("Copying std lib to ", out, False)
+            self.check_tagfile(target_dir, [f'{self.graalvmVersion}\n', 'include:.*\n'])
+
+            shutil.copyfile(pom_template, os.path.join(target_dir, "pom.xml"))
+            util.patch_pom_repositories(os.path.join(target_dir, "pom.xml"))
+            home_tag = """
+                        <pythonHome>
+                            <includes>
+                                <include></include>
+                                <include> </include>
+                            </includes>
+                            <excludes>
+                                <exclude></exclude>
+                                <exclude> </exclude>
+                            </excludes>
+                        </pythonHome>
+                    """
+            replace_in_file(os.path.join(target_dir, "pom.xml"), "</configuration>", home_tag + "</configuration>")
+            out, return_code = util.run_cmd(process_resources_cmd, self.env, cwd=target_dir)
+            util.check_ouput("BUILD SUCCESS", out)
+            util.check_ouput("Copying std lib to ", out, False)
+            self.check_tagfile(target_dir, [f'{self.graalvmVersion}\n', 'include:.*\n'])
+
+            # 3. process-resources with pythonHome includes and excludes
+            home_tag = """
+                <pythonHome>
+                    <includes>
+                        <include>.*__init__\.py</include>
+                    </includes>
+                    <excludes>
+                        <exclude>.*html/__init__\.py</exclude>
+                    </excludes>
+                </pythonHome>
+            """
+            replace_in_file(os.path.join(target_dir, "pom.xml"), "</configuration>", home_tag + "</configuration>")
+            out, return_code = util.run_cmd(process_resources_cmd, self.env, cwd=target_dir)
+            util.check_ouput("BUILD SUCCESS", out)
+            util.check_ouput("Deleting GraalPy home due to changed includes or excludes", out)
+            util.check_ouput("Copying std lib to ", out)
+            self.check_tagfile(target_dir, [f'{self.graalvmVersion}\n', 'include:.*__init__\\.py\n', 'exclude:.*html/__init__\\.py\n'])
+
+            # 4. check fileslist.txt
             fl_path = os.path.join(target_dir, "target", "classes", VFS_PREFIX, "fileslist.txt")
             with open(fl_path) as f:
                 for line in f:
                     line = f.readline()
                     # string \n
                     line = line[:len(line)-1]
-                    if line.endswith("/") or line == "/" + VFS_PREFIX + "/home/tagfile" or line == "/" + VFS_PREFIX + "/proj/hello.py":
+                    if not line.startswith("/" + VFS_PREFIX + "/home/") or line.endswith("/"):
                         continue
                     assert line.endswith("/__init__.py")
                     assert not line.endswith("html/__init__.py")