Skip to content

Commit ee19b0c

Browse files
committed
optionally switch off info log level in test_gradle_plugin
1 parent cd29dbe commit ee19b0c

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
from tests.standalone.util import TemporaryTestDirectory, Logger
4848

4949
MISSING_FILE_WARNING = "The list of installed Python packages does not match the packages specified in the graalpy-maven-plugin configuration"
50-
PACKAGES_CHANGED_ERROR = "but packages in graalpy-maven-plugin configuration are different then previously used to generate the lock file"
50+
PACKAGES_CHANGED_ERROR = "packages and their version constraints in graalpy-maven-plugin configuration are different then previously used to generate the lock file"
5151
VENV_UPTODATE = "Virtual environment is up to date with lock file, skipping install"
5252

5353
def append(file, txt):
@@ -133,17 +133,20 @@ def check_gradle_generated_app(self, community):
133133
build_file = os.path.join(target_dir, self.build_file_name)
134134
append(build_file, self.packages_termcolor(community))
135135

136-
gradlew_cmd = util.get_gradle_wrapper(target_dir, self.env)
137136
log = Logger()
138137

139138
# build
139+
gradlew_cmd = util.get_gradle_wrapper(target_dir, self.env, verbose=False)
140+
140141
cmd = gradlew_cmd + ["build"]
141142
out, return_code = util.run_cmd(cmd, self.env, cwd=target_dir, logger=log)
142143
util.check_ouput("BUILD SUCCESS", out, logger=log)
143144
util.check_ouput("Virtual filesystem is deployed to default resources directory", out, logger=log)
144145
util.check_ouput("This can cause conflicts if used with other Java libraries that also deploy GraalPy virtual filesystem", out, logger=log)
145146
self.check_filelist(target_dir, log)
146147

148+
gradlew_cmd = util.get_gradle_wrapper(target_dir, self.env)
149+
147150
cmd = gradlew_cmd + ["nativeCompile"]
148151
out, return_code = util.run_cmd(cmd, self.env, cwd=target_dir, logger=log)
149152
util.check_ouput("BUILD SUCCESS", out, logger=log)

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,15 @@ def get_mvn_wrapper(project_dir, env):
227227
check_ouput(MAVEN_VERSION, out)
228228
return mvn_cmd
229229

230-
def get_gradle_wrapper(project_dir, env):
230+
def get_gradle_wrapper(project_dir, env, verbose=True):
231231
gradle_cmd = [os.path.abspath(os.path.join(project_dir, "gradlew" if 'win32' != sys.platform else "gradlew.bat"))]
232232
cmd = gradle_cmd + ["--version"]
233233
out, return_code = run_cmd(cmd, env, cwd=project_dir)
234234
check_ouput(GRADLE_VERSION, out)
235-
return gradle_cmd + ["-i"]
235+
if verbose:
236+
return gradle_cmd + ["-i"]
237+
else:
238+
return gradle_cmd
236239

237240
def get_gp():
238241
if "PYTHON_STANDALONE_HOME" not in os.environ:

0 commit comments

Comments
 (0)