Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.toolbox
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
6
Merge Requests
6
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
slapos.toolbox
Commits
ca3341d5
Commit
ca3341d5
authored
Oct 18, 2021
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Plain Diff
Stabilizing fixup: test_monitor_instance_state
See merge request
nexedi/slapos.toolbox!102
parents
a9f3cb5f
7350d318
Pipeline
#21009
passed with stage
in 0 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
slapos/test/monitor/testglobalstate.py
slapos/test/monitor/testglobalstate.py
+6
-3
No files found.
slapos/test/monitor/testglobalstate.py
View file @
ca3341d5
...
@@ -100,7 +100,10 @@ ipv4 = 10.0.151.118
...
@@ -100,7 +100,10 @@ ipv4 = 10.0.151.118
base_dir
=
self
.
base_dir
,
base_dir
=
self
.
base_dir
,
root_title
=
"Monitor ROOT"
,
root_title
=
"Monitor ROOT"
,
title
=
"Monitor"
,
title
=
"Monitor"
,
url_list
=
"https://sub.monitor.test.com https://sub2.monitor.test.com"
,
# These two URL is for retrive monitor title from getMonitorTitleFromUrl
# which need by the bootstrapMonitor in test_monitor_instance_state
# With this change, we can get the title "Unknown Instance" directly
url_list
=
"foo://sub.monitor.foo.com bar://sub2.monitor.bar.com"
,
base_url
=
"https://monitor.test.com"
,
base_url
=
"https://monitor.test.com"
,
etc_dir
=
self
.
etc_dir
,
etc_dir
=
self
.
etc_dir
,
promise_runner_pid
=
os
.
path
.
join
(
self
.
base_dir
,
'run'
,
'monitor-promises.pid'
),
promise_runner_pid
=
os
.
path
.
join
(
self
.
base_dir
,
'run'
,
'monitor-promises.pid'
),
...
@@ -234,8 +237,8 @@ exit %(code)s
...
@@ -234,8 +237,8 @@ exit %(code)s
"href": "https://monitor.test.com/share/private/"
"href": "https://monitor.test.com/share/private/"
},
},
"related_monitor": [
"related_monitor": [
{"href": "
https://sub.monitor.test
.com/share/public"},
{"href": "
foo://sub.monitor.foo
.com/share/public"},
{"href": "
https://sub2.monitor.test
.com/share/public"}
{"href": "
bar://sub2.monitor.bar
.com/share/public"}
]
]
},
},
"aggregate_reference": "COMP-1234",
"aggregate_reference": "COMP-1234",
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment