Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
batmen
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sepia-pub
mael
batmen
Commits
62b9490c
Commit
62b9490c
authored
2 years ago
by
jgatt
Browse files
Options
Downloads
Patches
Plain Diff
windows are now required to be non-empty
parent
f72797df
Branches
Branches containing commit
No related tags found
1 merge request
!12
Merge Request multibehavior
Pipeline
#5495
passed
2 years ago
Stage: build-and-test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/users/broker.cpp
+2
-2
2 additions, 2 deletions
src/users/broker.cpp
test/test_assertion_error.py
+8
-3
8 additions, 3 deletions
test/test_assertion_error.py
with
10 additions
and
5 deletions
src/users/broker.cpp
+
2
−
2
View file @
62b9490c
...
@@ -307,8 +307,8 @@ DMWindow_list* Broker::parse_dm_windows(const std::string attr_name,
...
@@ -307,8 +307,8 @@ DMWindow_list* Broker::parse_dm_windows(const std::string attr_name,
const
Value
&
windows_param
=
(
*
user_description_file
)[
attr_name
.
c_str
()];
const
Value
&
windows_param
=
(
*
user_description_file
)[
attr_name
.
c_str
()];
std
::
string
error_message
=
"Invalid user_description file: field "
;
std
::
string
error_message
=
"Invalid user_description file: field "
;
error_message
+=
attr_name
;
error_message
+=
attr_name
;
error_message
=
"should be a
n
array"
;
error_message
+
=
"
should be a
non-empty
array"
;
PPK_ASSERT_ERROR
(
windows_param
.
IsArray
(),
PPK_ASSERT_ERROR
(
windows_param
.
IsArray
()
&&
windows_param
.
GetArray
().
Size
()
!=
0
,
error_message
.
c_str
());
error_message
.
c_str
());
error_message
=
"Invalid user_description file: the field "
;
error_message
=
"Invalid user_description file: the field "
;
error_message
+=
attr_name
;
error_message
+=
attr_name
;
...
...
This diff is collapsed.
Click to expand it.
test/test_assertion_error.py
+
8
−
3
View file @
62b9490c
...
@@ -21,9 +21,9 @@ def make_error_file(seed=None,red_windows=None,yellow_windows=None) :
...
@@ -21,9 +21,9 @@ def make_error_file(seed=None,red_windows=None,yellow_windows=None) :
}
}
if
seed
:
if
seed
:
error_file
[
"
seed
"
]
=
seed
error_file
[
"
seed
"
]
=
seed
if
red_windows
:
if
not
(
red_windows
is
None
)
:
error_file
[
"
red_windows
"
]
=
red_windows
error_file
[
"
red_windows
"
]
=
red_windows
if
yellow_windows
:
if
not
(
yellow_windows
is
None
)
:
error_file
[
"
yellow_windows
"
]
=
yellow_windows
error_file
[
"
yellow_windows
"
]
=
yellow_windows
with
open
(
schedconf_file
,
'
w+
'
)
as
error_description_file
:
with
open
(
schedconf_file
,
'
w+
'
)
as
error_description_file
:
json
.
dump
(
error_file
,
error_description_file
)
json
.
dump
(
error_file
,
error_description_file
)
...
@@ -69,7 +69,12 @@ def test_error_no_window(platform_multiC) :
...
@@ -69,7 +69,12 @@ def test_error_no_window(platform_multiC) :
make_error_file
(
3
)
make_error_file
(
3
)
out_dir
=
error_user
(
"
dm_user_multi_behavior_no_windows
"
,
platform_multiC
,
"
window
"
)
out_dir
=
error_user
(
"
dm_user_multi_behavior_no_windows
"
,
platform_multiC
,
"
window
"
)
def
test_empty_red_window
(
platform_multiC
)
:
make_error_file
(
3
,
red_windows
=
[])
out_dir
=
error_user
(
"
dm_user_multi_behavior_empty_red_windows
"
,
platform_multiC
,
"
red_windows should be a non-empty array
"
)
def
test_empty_yellow_window
(
platform_multiC
)
:
make_error_file
(
3
,
yellow_windows
=
[])
out_dir
=
error_user
(
"
dm_user_multi_behavior_empty_yellow_windows
"
,
platform_multiC
,
"
yellow_windows should be a non-empty array
"
)
def
test_error_invalid_window
(
platform_multiC
)
:
def
test_error_invalid_window
(
platform_multiC
)
:
invalid_windows_list
=
[[[
0
]],
[[
0.0
,
1.0
]],
[[
0
,
1
,
2
]],
[[
0
,
1
],
[
1
,
2
],
[
3
,
4
],
5
],
[[
1
,
4.0
]],
[[
1.0
,
4
]]]
invalid_windows_list
=
[[[
0
]],
[[
0.0
,
1.0
]],
[[
0
,
1
,
2
]],
[[
0
,
1
],
[
1
,
2
],
[
3
,
4
],
5
],
[[
1
,
4.0
]],
[[
1.0
,
4
]]]
for
i
in
range
(
len
(
invalid_windows_list
)):
for
i
in
range
(
len
(
invalid_windows_list
)):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment