github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-22 13:38:26 +00:00
Code Issues Projects Releases Wiki Activity

qmp_test: Change QMP version from 2.6 to 2.9

Browse Source 
Also change TestQMPXBlockdevDel to TestQMPBlockdevDel because QMP verion
2.9 and older use blockdev-del but not x-blockdev-del.

Signed-off-by: Hui Zhu <teawater@hyper.sh>
This commit is contained in:
Hui Zhu 2018-11-23 09:33:21 +08:00
parent e82e8498c5
commit a0b0c86e9c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qemu/qmp_test.go
View File

@ -33,10 +33,10 @@ import (
const ( const (
microStr = "50" microStr = "50"
minorStr = "6" minorStr = "9"
majorStr = "2" majorStr = "2"
micro = 50 micro = 50
minor = 6 minor = 9
major = 2 major = 2
cap1 = "one" cap1 = "one"
cap2 = "two" cap2 = "two"
@ -562,17 +562,17 @@ func TestQMPSCSIDeviceAdd(t *testing.T) {
<-disconnectedCh <-disconnectedCh
} }
// Checks that the x-blockdev-del command is correctly sent. // Checks that the blockdev-del command is correctly sent.
// //
// We start a QMPLoop, send the x-blockdev-del command and stop the loop. // We start a QMPLoop, send the blockdev-del command and stop the loop.
// //
// The x-blockdev-del command should be correctly sent and the QMP loop should // The blockdev-del command should be correctly sent and the QMP loop should
// exit gracefully. // exit gracefully.
func TestQMPXBlockdevDel(t *testing.T) { func TestQMPBlockdevDel(t *testing.T) {
connectedCh := make(chan *QMPVersion) connectedCh := make(chan *QMPVersion)
disconnectedCh := make(chan struct{}) disconnectedCh := make(chan struct{})
buf := newQMPTestCommandBuffer(t) buf := newQMPTestCommandBuffer(t)
buf.AddCommand("x-blockdev-del", nil, "return", nil) buf.AddCommand("blockdev-del", nil, "return", nil)
cfg := QMPConfig{Logger: qmpTestLogger{}} cfg := QMPConfig{Logger: qmpTestLogger{}}
q := startQMPLoop(buf, cfg, connectedCh, disconnectedCh) q := startQMPLoop(buf, cfg, connectedCh, disconnectedCh)
q.version = checkVersion(t, connectedCh) q.version = checkVersion(t, connectedCh)