diff --git a/test/box/00000000000000000001.snap b/test/box/00000000000000000001.snap deleted file mode 100644 index 8f8d8ac5b4c8634e2099b9d6671560db48518960..0000000000000000000000000000000000000000 Binary files a/test/box/00000000000000000001.snap and /dev/null differ diff --git a/test/box/sql.result b/test/box/sql.result index 128a69408d09e4be88497042f8361590994d5c49..95c433fe758ef2b14ef53fd132b803820fcad7e6 100644 --- a/test/box/sql.result +++ b/test/box/sql.result @@ -1,3 +1,11 @@ +box.insert(box.schema.SPACE_ID, 0, 0, 'tweedledum') +--- +- [0, 0, 'tweedledum'] +... +box.insert(box.schema.INDEX_ID, 0, 0, 'primary', 'hash', 1, 1, 0, 'num') +--- +- [0, 0, 'primary', 1752392040, 1, 1, 0, 'num'] +... ping ok --- @@ -15,9 +23,9 @@ No match select * from t0 where k0 = 1 Found 1 tuple: [1, 'I am a tuple'] -save snapshot +box.snapshot() --- -ok +- ok ... select * from t0 where k0 = 1 Found 1 tuple: @@ -96,7 +104,7 @@ select * from t65537 where k0 = 0 An error occurred: ER_NO_SUCH_SPACE, 'Space 65537 does not exist' select * from t4294967295 where k0 = 0 An error occurred: ER_NO_SUCH_SPACE, 'Space 4294967295 does not exist' -box.space[0]:truncate() +box.space[0]:drop() --- ... # @@ -105,5 +113,5 @@ box.space[0]:truncate() show status --- -unknown command. try typing help. +- error: '[string "show status"]:1: ''='' expected near ''status''' ... diff --git a/test/box/sql.test.py b/test/box/sql.test.py index 81bc0ed15106652b339be15e7eb673b0077af59d..309aa540b5c586b788c78ab07a60a530c6fa1b4c 100644 --- a/test/box/sql.test.py +++ b/test/box/sql.test.py @@ -1,4 +1,6 @@ # encoding: utf-8 +admin("box.insert(box.schema.SPACE_ID, 0, 0, 'tweedledum')") +admin("box.insert(box.schema.INDEX_ID, 0, 0, 'primary', 'hash', 1, 1, 0, 'num')") sql("ping") # xxx: bug -- currently selects no rows sql("select * from t0") @@ -10,7 +12,7 @@ sql("select * from t0 where k0 = 0") sql("select * from t0 where k0 = 2") server.restart() sql("select * from t0 where k0 = 1") -admin("save snapshot") +admin("box.snapshot()") sql("select * from t0 where k0 = 1") server.restart() sql("select * from t0 where k0 = 1") @@ -57,7 +59,7 @@ print """# sql("select * from t1 where k0 = 0") sql("select * from t65537 where k0 = 0") sql("select * from t4294967295 where k0 = 0") -admin("box.space[0]:truncate()") +admin("box.space[0]:drop()") print """# # A test case for: http://bugs.launchpad.net/bugs/716683