Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
marscher committed Aug 22, 2024
1 parent 5f474f0 commit 29838e8
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 1 deletion.
1 change: 0 additions & 1 deletion test/jpypetest/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,5 +153,4 @@ def java_version():
"import jpype; jpype.startJVM(); "
"print(jpype.java.lang.System.getProperty('java.version'))"]),

Check warning

Code scanning / CodeQL

Implicit string concatenation in a list Warning test

Implicit string concatenation. Maybe missing a comma?
encoding='ascii')
print("java_version:", java_version)
return tuple(map(int, java_version.split(".")))
9 changes: 9 additions & 0 deletions test/jpypetest/test_sql_h2.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# This file is Public Domain and may be used without restrictions,
# because nobody should have to waste their lives typing this again.
import pytest

import jpype
from jpype.types import *
from jpype import java
Expand All @@ -19,6 +21,13 @@

db_name = "jdbc:h2:mem:testdb"

def setUpModule(module):
from common import java_version
version = java_version()
if version[0] == 1 and version[1] == 8:
pytest.skip("jdk8 unsupported", allow_module_level=True)



class ConnectTestCase(common.JPypeTestCase):
def setUp(self):
Expand Down
8 changes: 8 additions & 0 deletions test/jpypetest/test_sql_hsqldb.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@
#first = "jdbc:derby:memory:myDb;create=True"


def setUpModule(module):
from common import java_version
import pytest
version = java_version()
if version[0] == 1 and version[1] == 8:
pytest.skip("jdk8 unsupported", allow_module_level=True)


@common.unittest.skipUnless(zlib, "requires zlib")
class ConnectTestCase(common.JPypeTestCase):
def setUp(self):
Expand Down

0 comments on commit 29838e8

Please sign in to comment.