@@ -188,7 +188,7 @@ class REMOTEHOST:
188
188
REMOTEHOST .xprotocol_port = str (config ["remote" ]["xprotocol_port" ])
189
189
REMOTEHOST .port = str (config ["remote" ]["port" ])
190
190
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
192
192
# os.environ['MYSQLSH_PROMPT_THEME'] = str(config["general"]["MYSQLSH_PROMPT_THEME"])
193
193
194
194
@@ -243,7 +243,7 @@ def setUpClass(self):
243
243
results = ''
244
244
init_command = [MYSQL_SHELL , '--interactive=full' ]
245
245
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>" ),
247
247
("\\ sql\n " , "mysql-sql>" ),
248
248
("use world_x;\n " , "mysql-sql>" ),
249
249
("show tables ;\n " , "4 rows in set" ),
@@ -6686,7 +6686,7 @@ def test_MYS_286_01(self):
6686
6686
("session.sql(\' create table world_x.mys286 (date datetime);\' )\n " , "Query OK" ),
6687
6687
("Table = session.getSchema(\' world_x\' ).getTable(\' mys286\' )\n " , "<Table:mys286>" ),
6688
6688
("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" ),
6690
6690
("session.sql(\' DROP TABLE world_x.mys286;\' )\n " , "Query OK" )
6691
6691
]
6692
6692
results = exec_xshell_commands (init_command , x_cmds )
@@ -7043,7 +7043,7 @@ def test_MYS_338_03(self):
7043
7043
x_cmds = [(";\n " , "mysql-js>" ),
7044
7044
("\\ connect -c {0}:{1}@{2}:{3}\n " .format (REMOTEHOST .user , "wrongpass" , REMOTEHOST .host ,
7045
7045
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" ),
7047
7047
]
7048
7048
results = exec_xshell_commands (init_command , x_cmds )
7049
7049
self .assertEqual (results , 'PASS' )
@@ -8100,7 +8100,7 @@ def test_MYS_451(self):
8100
8100
"\\ warnings (\\ W) Show warnings after every statement." + os .linesep + \
8101
8101
"\\ nowarnings (\\ w) Don't show warnings after every statement." + os .linesep + \
8102
8102
"\\ 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
8104
8104
# "\\saveconn (\\savec) Store a session configuration." + os.linesep + \
8105
8105
# "\\rmconn (\\rmc) Remove the stored session configuration." + os.linesep + \
8106
8106
# "\\lsconn (\\lsc) List stored session configurations."
@@ -8487,7 +8487,7 @@ def test_MYS_542_01(self):
8487
8487
'''[MYS-542]:Session.uri display wrong menu data to the user'''
8488
8488
results = 'PASS'
8489
8489
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 ?" ),
8491
8491
("2\n " , "specify the MySQL server URI" ),
8492
8492
("{0}@{1}:{2}\n " .format (LOCALHOST .user , LOCALHOST .host , LOCALHOST .port ), "Enter password" ),
8493
8493
("{0}\n " .format (LOCALHOST .password ), "{0}@{1}:{2}" .format (LOCALHOST .user , LOCALHOST .host ,
@@ -8524,7 +8524,7 @@ def test_MYS_542_02(self):
8524
8524
'''[MYS-542]:Session.uri display wrong menu data to the user'''
8525
8525
results = 'PASS'
8526
8526
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 ?" ),
8528
8528
("1\n " , "specify the MySQL server URI" ),
8529
8529
("{0}@{1}:{2}\n " .format (LOCALHOST .user , LOCALHOST .host , LOCALHOST .xprotocol_port ),
8530
8530
"Enter password" ),
@@ -8573,7 +8573,7 @@ def test_MYS_560(self):
8573
8573
self .assertEqual (results , 'PASS' )
8574
8574
8575
8575
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
8577
8577
URI parsing does not decode PCT before passing to other systems'''
8578
8578
results = ''
8579
8579
init_command = [MYSQL_SHELL , '--interactive=full' , '--classic' , '--sqlc' , '--uri={0}:{1}@{2}:{3}' .
@@ -8703,7 +8703,7 @@ def test_MYS_796(self):
8703
8703
"\\ warnings (\\ W) Show warnings after every statement." + os .linesep +
8704
8704
"\\ nowarnings (\\ w) Don't show warnings after every statement." + os .linesep +
8705
8705
"\\ 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 +
8707
8707
"" + os .linesep +
8708
8708
"For help on a specific command use the command as \? <command>" + os .linesep +
8709
8709
"" + os .linesep +
@@ -8761,7 +8761,7 @@ def test_MYS_816(self):
8761
8761
stdoutsplitted = stdoutdata .splitlines ()
8762
8762
for line in stdoutsplitted :
8763
8763
count += 1
8764
- found = line .find ("Node Session successfully established " , 0 , len (line ))
8764
+ found = line .find ("(X protocol) " , 0 , len (line ))
8765
8765
if found == - 1 and count > len (stdoutsplitted ):
8766
8766
results = "FAIL"
8767
8767
break
0 commit comments