Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
tests/qapi-schema: Avoid 'str' in alternate test cases
The next commit is going to make alternate members of type 'str' conflict with other scalar types. Would break a few test cases that don't actually require 'str'. Flip them from 'str' to 'bool' or 'EnumOne'. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <1495471335-23707-4-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
- Loading branch information
Markus Armbruster
committed
May 31, 2017
1 parent
8339fa2
commit 8168ca8
Showing
10 changed files
with
68 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# we reject a nested alternate branch | ||
{ 'alternate': 'Alt1', | ||
'data': { 'name': 'str', 'value': 'int' } } | ||
'data': { 'name': 'bool', 'value': 'int' } } | ||
{ 'alternate': 'Alt2', | ||
'data': { 'nested': 'Alt1', 'b': 'bool' } } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
# we do not allow alternate arguments | ||
{ 'alternate': 'Alt', 'data': { 'case1': 'int', 'case2': 'str' } } | ||
{ 'alternate': 'Alt', 'data': { 'case1': 'int', 'case2': 'bool' } } | ||
{ 'command': 'oops', 'data': 'Alt' } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,4 +6,4 @@ | |
# @bb: b | ||
## | ||
{ 'alternate': 'AorB', | ||
'data': { 'a': 'str', 'b': 'int' } } | ||
'data': { 'a': 'bool', 'b': 'int' } } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
# we reject returns if it is an alternate type | ||
{ 'alternate': 'Alt', 'data': { 'a': 'int', 'b': 'str' } } | ||
{ 'alternate': 'Alt', 'data': { 'a': 'int', 'b': 'bool' } } | ||
{ 'command': 'oops', 'returns': 'Alt' } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters