Skip to content

Commit 69c70b0

Browse files
omendezomendez
authored andcommitted
Updating qatest file including some aux files
1 parent 716959f commit 69c70b0

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

shell-qa-test/aux_files/BigCreate_Classic.py

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

shell-qa-test/aux_files/BigCreate_Coll_Node.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@
2323
}
2424
coll.add(res).execute()
2525
id_m = id_m + 1
26+

shell-qa-test/aux_files/BigCreate_Node.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

shell-qa-test/aux_files/BigCreate_Node.py

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

shell-qa-test/xshell_automated.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ class REMOTEHOST:
188188
REMOTEHOST.xprotocol_port = str(config["remote"]["xprotocol_port"])
189189
REMOTEHOST.port = str(config["remote"]["port"])
190190

191-
# This prompt_theme is expected for shell 8.0.x version only
191+
# This theme is expected for shell 8.0.x version only
192192
# os.environ['MYSQLSH_PROMPT_THEME'] = str(config["general"]["MYSQLSH_PROMPT_THEME"])
193193

194194

@@ -243,7 +243,7 @@ def setUpClass(self):
243243
results = ''
244244
init_command = [MYSQL_SHELL, '--interactive=full']
245245
x_cmds = [
246-
('\\connect -n {0}:{1}@{2}\n'.format(LOCALHOST.user, LOCALHOST.password, LOCALHOST.host), "mysql-js>"),
246+
('\\connect -n {0}:{1}@{2}:{3}\n'.format(LOCALHOST.user, LOCALHOST.password, LOCALHOST.host, LOCALHOST.xprotocol_port), "mysql-js>"),
247247
("\\sql\n", "mysql-sql>"),
248248
("use world_x;\n", "mysql-sql>"),
249249
("show tables ;\n", "4 rows in set"),
@@ -6686,7 +6686,7 @@ def test_MYS_286_01(self):
66866686
("session.sql(\'create table world_x.mys286 (date datetime);\')\n", "Query OK"),
66876687
("Table = session.getSchema(\'world_x\').getTable(\'mys286\')\n", "<Table:mys286>"),
66886688
("Table.insert().values('2016-03-14 12:36:37')\n", "Query OK, 1 item affected"),
6689-
("Table.select()\n", "2016-04-14 12:36:37"),
6689+
("Table.select()\n", "2016-03-14 12:36:37"),
66906690
("session.sql(\'DROP TABLE world_x.mys286;\')\n", "Query OK")
66916691
]
66926692
results = exec_xshell_commands(init_command, x_cmds)
@@ -7043,7 +7043,7 @@ def test_MYS_338_03(self):
70437043
x_cmds = [(";\n", "mysql-js>"),
70447044
("\\connect -c {0}:{1}@{2}:{3}\n".format(REMOTEHOST.user, "wrongpass", REMOTEHOST.host,
70457045
REMOTEHOST.port), "mysql-js>"),
7046-
("db.name\n", "The db variable is not set, establish a global session first."),
7046+
("db.name\n", "The db variable is not set"),
70477047
]
70487048
results = exec_xshell_commands(init_command, x_cmds)
70497049
self.assertEqual(results, 'PASS')
@@ -8100,7 +8100,7 @@ def test_MYS_451(self):
81008100
"\\warnings (\\W) Show warnings after every statement." + os.linesep + \
81018101
"\\nowarnings (\\w) Don't show warnings after every statement." + os.linesep + \
81028102
"\\status (\\s) Print information about the current global connection." + os.linesep + \
8103-
"\\use (\\u) Set the current schema for the global session." + os.linesep
8103+
"\\use (\\u) Set the current schema for the active session." + os.linesep
81048104
# "\\saveconn (\\savec) Store a session configuration." + os.linesep + \
81058105
# "\\rmconn (\\rmc) Remove the stored session configuration." + os.linesep + \
81068106
# "\\lsconn (\\lsc) List stored session configurations."
@@ -8487,7 +8487,7 @@ def test_MYS_542_01(self):
84878487
'''[MYS-542]:Session.uri display wrong menu data to the user'''
84888488
results = 'PASS'
84898489
init_command = [MYSQL_SHELL, '--interactive=full', '--passwords-from-stdin']
8490-
x_cmds = [("session.uri\n", "The global session is not set, do you want to establish a session?"),
8490+
x_cmds = [("session.uri\n", "There is no active session, do you want to establish one?"),
84918491
("2\n", "specify the MySQL server URI"),
84928492
("{0}@{1}:{2}\n".format(LOCALHOST.user, LOCALHOST.host, LOCALHOST.port), "Enter password"),
84938493
("{0}\n".format(LOCALHOST.password), "{0}@{1}:{2}".format(LOCALHOST.user, LOCALHOST.host,
@@ -8524,7 +8524,7 @@ def test_MYS_542_02(self):
85248524
'''[MYS-542]:Session.uri display wrong menu data to the user'''
85258525
results = 'PASS'
85268526
init_command = [MYSQL_SHELL, '--interactive=full', '--passwords-from-stdin']
8527-
x_cmds = [("session.uri\n", "The global session is not set, do you want to establish a session?"),
8527+
x_cmds = [("session.uri\n", "There is no active session, do you want to establish one?"),
85288528
("1\n", "specify the MySQL server URI"),
85298529
("{0}@{1}:{2}\n".format(LOCALHOST.user, LOCALHOST.host, LOCALHOST.xprotocol_port),
85308530
"Enter password"),
@@ -8573,7 +8573,7 @@ def test_MYS_560(self):
85738573
self.assertEqual(results, 'PASS')
85748574

85758575
def test_MYS_583(self):
8576-
'''[MYS-583]: https://jira.oraclecorp.com/jira/browse/MYS-583
8576+
'''[MYS-583]: https://clustra.no.oracle.com/orabugs/bug.php?id=26422790
85778577
URI parsing does not decode PCT before passing to other systems'''
85788578
results = ''
85798579
init_command = [MYSQL_SHELL, '--interactive=full', '--classic', '--sqlc', '--uri={0}:{1}@{2}:{3}'.
@@ -8703,7 +8703,7 @@ def test_MYS_796(self):
87038703
"\\warnings (\\W) Show warnings after every statement." + os.linesep +
87048704
"\\nowarnings (\\w) Don't show warnings after every statement." + os.linesep +
87058705
"\\status (\\s) Print information about the current global connection." + os.linesep +
8706-
"\\use (\\u) Set the current schema for the global session."+ os.linesep +
8706+
"\\use (\\u) Set the current schema for the active session."+ os.linesep +
87078707
""+ os.linesep +
87088708
"For help on a specific command use the command as \? <command>"+ os.linesep +
87098709
"" + os.linesep +
@@ -8761,7 +8761,7 @@ def test_MYS_816(self):
87618761
stdoutsplitted = stdoutdata.splitlines()
87628762
for line in stdoutsplitted:
87638763
count += 1
8764-
found = line.find("Node Session successfully established", 0, len(line))
8764+
found = line.find("(X protocol)", 0, len(line))
87658765
if found == -1 and count > len(stdoutsplitted):
87668766
results = "FAIL"
87678767
break

0 commit comments

Comments
 (0)