Changeset: 77fd42ffe1d9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/77fd42ffe1d9
Modified Files:
sql/test/rel-optimizers/Tests/local-replica-with-actual-remote.py
sql/test/rel-optimizers/Tests/remote-replica.py
sql/test/rel-optimizers/Tests/replicas-join.py
Branch: Dec2023
Log Message:
Compatibility with older Python 3 (3.6 on power8 test system).
diffs (100 lines):
diff --git a/sql/test/rel-optimizers/Tests/local-replica-with-actual-remote.py
b/sql/test/rel-optimizers/Tests/local-replica-with-actual-remote.py
--- a/sql/test/rel-optimizers/Tests/local-replica-with-actual-remote.py
+++ b/sql/test/rel-optimizers/Tests/local-replica-with-actual-remote.py
@@ -10,16 +10,14 @@ with tempfile.TemporaryDirectory() as fa
os.mkdir(os.path.join(farm_dir, 'node2'))
os.mkdir(os.path.join(farm_dir, 'node3'))
- with (
- process.server(mapiport='0', dbname='master',
- dbfarm=os.path.join(farm_dir, 'master'),
- stdin=process.PIPE, stdout=process.PIPE,
- stderr=process.PIPE) as prc_1,
- process.server(mapiport='0', dbname='node2',
- dbfarm=os.path.join(farm_dir, 'node2'),
- stdin=process.PIPE, stdout=process.PIPE,
- stderr=process.PIPE) as prc_2
- ):
+ with process.server(mapiport='0', dbname='master',
+ dbfarm=os.path.join(farm_dir, 'master'),
+ stdin=process.PIPE, stdout=process.PIPE,
+ stderr=process.PIPE) as prc_1, \
+ process.server(mapiport='0', dbname='node2',
+ dbfarm=os.path.join(farm_dir, 'node2'),
+ stdin=process.PIPE, stdout=process.PIPE,
+ stderr=process.PIPE) as prc_2:
# create buz_rmt in node2
conn2 = pymonetdb.connect(database='node2', port=prc_2.dbport,
autocommit=True)
cur2 = conn2.cursor()
diff --git a/sql/test/rel-optimizers/Tests/remote-replica.py
b/sql/test/rel-optimizers/Tests/remote-replica.py
--- a/sql/test/rel-optimizers/Tests/remote-replica.py
+++ b/sql/test/rel-optimizers/Tests/remote-replica.py
@@ -10,20 +10,18 @@ with tempfile.TemporaryDirectory() as fa
os.mkdir(os.path.join(farm_dir, 'node2'))
os.mkdir(os.path.join(farm_dir, 'node3'))
- with (
- process.server(mapiport='0', dbname='master',
- dbfarm=os.path.join(farm_dir, 'master'),
- stdin=process.PIPE, stdout=process.PIPE,
- stderr=process.PIPE) as prc_1,
- process.server(mapiport='0', dbname='node2',
- dbfarm=os.path.join(farm_dir, 'node2'),
- stdin=process.PIPE, stdout=process.PIPE,
- stderr=process.PIPE) as prc_2,
- process.server(mapiport='0', dbname='node3',
- dbfarm=os.path.join(farm_dir, 'node3'),
- stdin=process.PIPE, stdout=process.PIPE,
- stderr=process.PIPE) as prc_3
- ):
+ with process.server(mapiport='0', dbname='master',
+ dbfarm=os.path.join(farm_dir, 'master'),
+ stdin=process.PIPE, stdout=process.PIPE,
+ stderr=process.PIPE) as prc_1, \
+ process.server(mapiport='0', dbname='node2',
+ dbfarm=os.path.join(farm_dir, 'node2'),
+ stdin=process.PIPE, stdout=process.PIPE,
+ stderr=process.PIPE) as prc_2, \
+ process.server(mapiport='0', dbname='node3',
+ dbfarm=os.path.join(farm_dir, 'node3'),
+ stdin=process.PIPE, stdout=process.PIPE,
+ stderr=process.PIPE) as prc_3:
# create foo_r2 and bar_r2 in node2
conn2 = pymonetdb.connect(database='node2', port=prc_2.dbport,
autocommit=True)
cur2 = conn2.cursor()
diff --git a/sql/test/rel-optimizers/Tests/replicas-join.py
b/sql/test/rel-optimizers/Tests/replicas-join.py
--- a/sql/test/rel-optimizers/Tests/replicas-join.py
+++ b/sql/test/rel-optimizers/Tests/replicas-join.py
@@ -10,20 +10,18 @@ with tempfile.TemporaryDirectory() as fa
os.mkdir(os.path.join(farm_dir, 'node2'))
os.mkdir(os.path.join(farm_dir, 'node3'))
- with (
- process.server(mapiport='0', dbname='master',
- dbfarm=os.path.join(farm_dir, 'master'),
- stdin=process.PIPE, stdout=process.PIPE,
- stderr=process.PIPE) as prc_1,
- process.server(mapiport='0', dbname='node2',
- dbfarm=os.path.join(farm_dir, 'node2'),
- stdin=process.PIPE, stdout=process.PIPE,
- stderr=process.PIPE) as prc_2,
- process.server(mapiport='0', dbname='node3',
- dbfarm=os.path.join(farm_dir, 'node3'),
- stdin=process.PIPE, stdout=process.PIPE,
- stderr=process.PIPE) as prc_3
- ):
+ with process.server(mapiport='0', dbname='master',
+ dbfarm=os.path.join(farm_dir, 'master'),
+ stdin=process.PIPE, stdout=process.PIPE,
+ stderr=process.PIPE) as prc_1, \
+ process.server(mapiport='0', dbname='node2',
+ dbfarm=os.path.join(farm_dir, 'node2'),
+ stdin=process.PIPE, stdout=process.PIPE,
+ stderr=process.PIPE) as prc_2, \
+ process.server(mapiport='0', dbname='node3',
+ dbfarm=os.path.join(farm_dir, 'node3'),
+ stdin=process.PIPE, stdout=process.PIPE,
+ stderr=process.PIPE) as prc_3:
# create foo_p2 and members_n2 in node2
conn2 = pymonetdb.connect(database='node2', port=prc_2.dbport,
autocommit=True)
cur2 = conn2.cursor()
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
